git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
Makefile
diff --git
a/arch/arm/mach-mxs/Makefile
b/arch/arm/mach-mxs/Makefile
index
58e8923
..
6c38262
100644
(file)
--- a/
arch/arm/mach-mxs/Makefile
+++ b/
arch/arm/mach-mxs/Makefile
@@
-1,5
+1,5
@@
# Common support
-obj-y := clock.o devices.o
gpio.o
icoll.o iomux.o system.o timer.o
+obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o
obj-$(CONFIG_MXS_OCOTP) += ocotp.o
obj-$(CONFIG_PM) += pm.o