Merge branch 'linus' into core/generic-dma-coherent

[linux-2.6-omap-h63xx.git] / arch / arm / plat-mxc / Makefile

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