VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile
index 6f0c426..c59d487 100644 (file)
--- a/arch/ppc/platforms/Makefile
+++ b/arch/ppc/platforms/Makefile
@@ -2,13 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-ifdef CONFIG_PPC64BRIDGE
-EXTRA_AFLAGS           := -Wa,-mppc64bridge
-endif
-ifdef CONFIG_40x
-EXTRA_AFLAGS           := -Wa,-m405
-endif
-
 # Extra CFLAGS so we don't have to do relative includes
 CFLAGS_pmac_setup.o    += -Iarch/$(ARCH)/mm
 
@@ -26,10 +19,10 @@ obj-$(CONFIG_NVRAM)         += pmac_nvram.o
 obj-$(CONFIG_CPU_FREQ_PMAC)    += pmac_cpufreq.o
 endif
 obj-$(CONFIG_PMAC_BACKLIGHT)   += pmac_backlight.o
-obj-$(CONFIG_PPC_RTAS)         += error_log.o proc_rtas.o
 obj-$(CONFIG_PREP_RESIDUAL)    += residual.o
 obj-$(CONFIG_ADIR)             += adir_setup.o adir_pic.o adir_pci.o
 obj-$(CONFIG_EST8260)          += est8260_setup.o
+obj-$(CONFIG_PQ2ADS)           += pq2ads_setup.o
 obj-$(CONFIG_TQM8260)          += tqm8260_setup.o
 obj-$(CONFIG_EV64260)          += ev64260_setup.o
 obj-$(CONFIG_GEMINI)           += gemini_pci.o gemini_setup.o gemini_prom.o
@@ -44,9 +37,11 @@ obj-$(CONFIG_POWERPMC250)    += powerpmc250.o
 obj-$(CONFIG_PPLUS)            += pplus.o
 obj-$(CONFIG_PRPMC750)         += prpmc750.o
 obj-$(CONFIG_PRPMC800)         += prpmc800.o
+obj-$(CONFIG_RPX8260)          += rpx8260.o
 obj-$(CONFIG_SANDPOINT)                += sandpoint.o
 obj-$(CONFIG_SBC82xx)          += sbc82xx.o
 obj-$(CONFIG_SPRUCE)           += spruce.o
+obj-$(CONFIG_LITE5200)         += lite5200.o mpc5200.o
 
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_PPC_PMAC)         += pmac_smp.o