]> err.no Git - linux-2.6/blobdiff - arch/arm/mach-omap2/Makefile
Merge branch 'x86/nmi' into x86/devel
[linux-2.6] / arch / arm / mach-omap2 / Makefile
index 111eaa64258f2cbcec96bbf56875bebd957cb871..2feb6870b735d8ed49297a51ecb223fad90e47bd 100644 (file)
@@ -3,15 +3,19 @@
 #
 
 # Common support
-obj-y := irq.o id.o io.o sram-fn.o memory.o prcm.o clock.o mux.o devices.o serial.o
-
-obj-$(CONFIG_OMAP_MPU_TIMER)           += timer-gp.o
+obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o clock.o mux.o \
+               devices.o serial.o gpmc.o timer-gp.o
 
 # Power Management
 obj-$(CONFIG_PM) += pm.o sleep.o
 
+# Clock framework
+obj-$(CONFIG_ARCH_OMAP2)               += clock24xx.o
+obj-$(CONFIG_ARCH_OMAP3)               += clock34xx.o
+
 # Specific board support
 obj-$(CONFIG_MACH_OMAP_GENERIC)                += board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o
+obj-$(CONFIG_MACH_OMAP_2430SDP)                += board-2430sdp.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)                += board-apollon.o