Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / arch / arm / mach-msm / Makefile

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index feb9e469df9a2f9de595a4deeb51c28d0fd6e608..d12f2365585096d2d8ee3ffe04652a13d66318ca 100644 (file)
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,2 +1,7 @@
-obj-y += io.o idle.o 
+obj-y += io.o idle.o irq.o timer.o dma.o
+
+# Common code for board init
+obj-y += common.o
+
+obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o