Merge git://git.infradead.org/mtd-2.6

[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..1aa47001aa3b065b1b0d4f3a5387a0447bda5cb0 100644 (file)
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,2 +1,8 @@
-obj-y += io.o idle.o 
+obj-y += io.o idle.o irq.o timer.o dma.o
+obj-y += devices.o
+obj-y += proc_comm.o
+obj-y += vreg.o
+obj-y += clock.o clock-7x01a.o
+
+obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o