ARM: OMAP: re-organize duplicated 32k-timer code

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

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index a777ae003d793aaf0603f43d80b855bff1d6deef..5bf2dd1b2b6a8e95ab52ae6783dbb23290f2609f 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -4,13 +4,15 @@
 
 # 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 gpmc.o
-
-obj-$(CONFIG_OMAP_MPU_TIMER)           += timer-gp.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
+
 # DSP
 obj-$(CONFIG_OMAP_MMU_FWK)     += mmu_mach.o
 obj-$(CONFIG_OMAP_MBOX_FWK)    += mailbox_mach.o
@@ -21,13 +23,17 @@ mmu_mach-objs                       := mmu.o
 obj-$(CONFIG_MACH_OMAP_GENERIC)                += board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)                += board-2430sdp.o \
-                                          board-2430sdp-flash.o
+                                          board-2430sdp-flash.o \
+                                          board-2430sdp-usb.o
+obj-$(CONFIG_MACH_OMAP_2430OSK)                += board-2430osk.o
+obj-$(CONFIG_MACH_OMAP_3430SDP)                += board-3430sdp.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)                += board-apollon.o \
                                           board-apollon-keys.o
 obj-$(CONFIG_MACH_NOKIA_N800)          += board-n800.o board-n800-flash.o \
                                           board-n800-mmc.o board-n800-bt.o \
                                           board-n800-audio.o board-n800-usb.o \
-                                          board-n800-dsp.o board-n800-pm.o
+                                          board-n800-dsp.o \
+                                          board-n800-camera.o
 
 # TUSB 6010 chips
 obj-$(CONFIG_MACH_OMAP2_TUSB6010)      += usb-tusb6010.o