Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

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

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 3a6463f88ea2f748f8b33555340e76825298ab6d..fb78744f546b2d5f1a84e0b3ffb31ed2eb6080f4 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -182,7 +182,6 @@ obj-$(CONFIG_SOC_DRA7XX)            += clockdomains7xx_data.o
 obj-$(CONFIG_ARCH_OMAP2)               += $(clock-common) clock2xxx.o
 obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_dpllcore.o
 obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_virt_prcm_set.o
-obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_apll.o
 obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_dpll.o clkt_iclk.o
 obj-$(CONFIG_SOC_OMAP2430)             += clock2430.o
 obj-$(CONFIG_ARCH_OMAP3)               += $(clock-common) clock3xxx.o
@@ -251,13 +250,8 @@ obj-$(CONFIG_MACH_NOKIA_RX51)              += board-rx51.o sdram-nokia.o
 obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51-peripherals.o
 obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51-video.o
 obj-$(CONFIG_MACH_CM_T35)              += board-cm-t35.o
-obj-$(CONFIG_MACH_CM_T3517)            += board-cm-t3517.o
 obj-$(CONFIG_MACH_TOUCHBOOK)           += board-omap3touchbook.o
 
-obj-$(CONFIG_MACH_OMAP3517EVM)         += board-am3517evm.o
-
-obj-$(CONFIG_MACH_CRANEBOARD)          += board-am3517crane.o
-
 obj-$(CONFIG_MACH_SBC3530)             += board-omap3stalker.o
 
 # Platform specific device init code
@@ -287,7 +281,4 @@ ifneq ($(CONFIG_HWSPINLOCK_OMAP),)
 obj-y                                  += hwspinlock.o
 endif
 
-emac-$(CONFIG_TI_DAVINCI_EMAC)         := am35xx-emac.o
-obj-y                                  += $(emac-m) $(emac-y)
-
 obj-y                                  += common-board-devices.o twl-common.o dss-common.o