Merge branch 'omap-fixes'

[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 b44bb788cd29cd03a1a4abf5b9ec807a245bf259..76acefa0c765384648fb44e29797a8c6d50be087 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -21,15 +21,9 @@ obj-$(CONFIG_ARCH_OMAP2)             += sdrc2xxx.o
 # Power Management
 ifeq ($(CONFIG_PM),y)
 obj-y                                  += pm.o
-obj-$(CONFIG_ARCH_OMAP2)               += pm24xx.o
 obj-$(CONFIG_ARCH_OMAP24XX)            += sleep24xx.o
-obj-$(CONFIG_ARCH_OMAP3)               += pm34xx.o sleep34xx.o
-obj-$(CONFIG_PM_DEBUG)                 += pm-debug.o
 endif
 
-# SmartReflex driver
-obj-$(CONFIG_OMAP_SMARTREFLEX)         += smartreflex.o
-
 # Clock framework
 obj-$(CONFIG_ARCH_OMAP2)               += clock24xx.o
 obj-$(CONFIG_ARCH_OMAP3)               += clock34xx.o
@@ -40,7 +34,7 @@ mailbox_mach-objs             := mailbox.o
 
 # Specific board support
 obj-$(CONFIG_MACH_OMAP_GENERIC)                += board-generic.o
-obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o board-h4-mmc.o
+obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)                += board-2430sdp.o \
                                           board-2430sdp-flash.o \
                                           mmc-twl4030.o
@@ -63,7 +57,7 @@ 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-usb.o \
                                           board-n800-dsp.o \
                                           board-n800-camera.o
 obj-$(CONFIG_MACH_NOKIA_N810)          += board-n810.o