Remove extra code in arch/arm/*omap* to move it into omap-pool branch

[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 76acefa0c765384648fb44e29797a8c6d50be087..a2c3fcc27a22990e4d1a2f3220b3d6a079100148 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -28,59 +28,26 @@ endif
 obj-$(CONFIG_ARCH_OMAP2)               += clock24xx.o
 obj-$(CONFIG_ARCH_OMAP3)               += clock34xx.o
 
-# DSP
-obj-$(CONFIG_OMAP_MBOX_FWK)    += mailbox_mach.o
-mailbox_mach-objs              := mailbox.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 \
-                                          board-2430sdp-flash.o \
-                                          mmc-twl4030.o
-obj-$(CONFIG_MACH_OMAP2EVM)            += board-omap2evm.o \
                                           mmc-twl4030.o
-obj-$(CONFIG_MACH_OMAP_3430SDP)                += board-3430sdp.o \
-                                          mmc-twl4030.o \
-                                          board-3430sdp-flash.o
-obj-$(CONFIG_MACH_OMAP3EVM)            += board-omap3evm.o \
-                                          mmc-twl4030.o \
-                                          board-omap3evm-flash.o \
-                                          twl4030-generic-scripts.o
+obj-$(CONFIG_MACH_OMAP_APOLLON)                += board-apollon.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)                += board-omap3beagle.o \
-                                          mmc-twl4030.o \
-                                          twl4030-generic-scripts.o
-obj-$(CONFIG_MACH_OMAP_LDP)            += board-ldp.o \
                                           mmc-twl4030.o
-obj-$(CONFIG_MACH_OMAP_APOLLON)                += board-apollon.o \
-                                          board-apollon-mmc.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-usb.o \
-                                          board-n800-dsp.o \
-                                          board-n800-camera.o
-obj-$(CONFIG_MACH_NOKIA_N810)          += board-n810.o
-obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51.o \
-                                          board-n800-flash.o \
-                                          board-rx51-flash.o \
-                                          board-rx51-sdram.o \
-                                          board-rx51-video.o \
-                                          board-rx51-peripherals.o \
+obj-$(CONFIG_MACH_OMAP_LDP)            += board-ldp.o \
                                           mmc-twl4030.o
-
 obj-$(CONFIG_MACH_OVERO)               += board-overo.o \
-                                          mmc-twl4030.o \
-                                          twl4030-generic-scripts.o
+                                          mmc-twl4030.o
 obj-$(CONFIG_MACH_OMAP3_PANDORA)       += board-omap3pandora.o \
                                           mmc-twl4030.o
+obj-$(CONFIG_MACH_OMAP_3430SDP)                += board-3430sdp.o \
+                                          mmc-twl4030.o
 
+obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51.o \
+                                          board-rx51-peripherals.o \
 # Platform specific device init code
-obj-$(CONFIG_USB_MUSB_SOC)             += usb-musb.o
-obj-$(CONFIG_MACH_OMAP2_TUSB6010)      += usb-tusb6010.o
-
-ifneq ($(CONFIG_USB_EHCI_HCD),)
-       obj-y                           += usb-ehci.o
+ifeq ($(CONFIG_USB_MUSB_SOC),y)
+obj-y                                  += usb-musb.o
 endif
-
-