Merge branch 'linus' into cpus4096

[pandora-kernel.git] / arch / arm / plat-mxc / Makefile

diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index 66ad9c2..db66e9a 100644 (file)
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -3,8 +3,6 @@
 #
 
 # Common support
-obj-y := irq.o
+obj-y := irq.o clock.o gpio.o time.o
 
-obj-m :=
-obj-n :=
-obj-  :=
+obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o