Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-2.6] / arch / ppc / platforms / Makefile

diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile
index e17fad4706218224c41a7c21cef4748568e9acec..6260231987cbef58c31e2e28baf16cc17f8b5755 100644 (file)
--- a/arch/ppc/platforms/Makefile
+++ b/arch/ppc/platforms/Makefile
@@ -2,13 +2,8 @@
 # Makefile for the linux kernel.
 #
 
-obj-$(CONFIG_APUS)             += apus_setup.o
-ifeq ($(CONFIG_APUS),y)
-obj-$(CONFIG_PCI)              += apus_pci.o
-endif
 obj-$(CONFIG_PPC_PREP)         += prep_pci.o prep_setup.o
 obj-$(CONFIG_PREP_RESIDUAL)    += residual.o
-obj-$(CONFIG_PQ2ADS)           += pq2ads.o
 obj-$(CONFIG_TQM8260)          += tqm8260_setup.o
 obj-$(CONFIG_CPCI690)          += cpci690.o
 obj-$(CONFIG_EV64260)          += ev64260.o
@@ -28,6 +23,3 @@ obj-$(CONFIG_SBC82xx)         += sbc82xx.o
 obj-$(CONFIG_SPRUCE)           += spruce.o
 obj-$(CONFIG_LITE5200)         += lite5200.o
 obj-$(CONFIG_EV64360)          += ev64360.o
-obj-$(CONFIG_MPC86XADS)                += mpc866ads_setup.o
-obj-$(CONFIG_MPC885ADS)                += mpc885ads_setup.o
-obj-$(CONFIG_ADS8272)          += mpc8272ads_setup.o