vserver 1.9.5.x5

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

diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile
index 31f2d30..6ec8fe0 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
 
@@ -18,7 +11,7 @@ obj-$(CONFIG_PCI)             += apus_pci.o
 endif
 obj-$(CONFIG_PPC_PMAC)         += pmac_pic.o pmac_setup.o pmac_time.o \
                                        pmac_feature.o pmac_pci.o pmac_sleep.o \
-                                       pmac_low_i2c.o
+                                       pmac_low_i2c.o pmac_cache.o
 obj-$(CONFIG_PPC_CHRP)         += chrp_setup.o chrp_time.o chrp_pci.o
 obj-$(CONFIG_PPC_PREP)         += prep_pci.o prep_setup.o
 ifeq ($(CONFIG_PPC_PMAC),y)
@@ -26,18 +19,20 @@ 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.o
 obj-$(CONFIG_TQM8260)          += tqm8260_setup.o
-obj-$(CONFIG_EV64260)          += ev64260_setup.o
+obj-$(CONFIG_CPCI690)          += cpci690.o
+obj-$(CONFIG_EV64260)          += ev64260.o
+obj-$(CONFIG_CHESTNUT)         += chestnut.o
 obj-$(CONFIG_GEMINI)           += gemini_pci.o gemini_setup.o gemini_prom.o
 obj-$(CONFIG_K2)               += k2.o
-obj-$(CONFIG_LOPEC)            += lopec_setup.o lopec_pci.o
+obj-$(CONFIG_LOPEC)            += lopec.o
+obj-$(CONFIG_KATANA)           += katana.o
 obj-$(CONFIG_MCPN765)          += mcpn765.o
 obj-$(CONFIG_MENF1)            += menf1_setup.o menf1_pci.o
-obj-$(CONFIG_MVME5100)         += mvme5100_setup.o mvme5100_pci.o
+obj-$(CONFIG_MVME5100)         += mvme5100.o
 obj-$(CONFIG_PAL4)             += pal4_setup.o pal4_pci.o
 obj-$(CONFIG_PCORE)            += pcore.o
 obj-$(CONFIG_POWERPMC250)      += powerpmc250.o
@@ -45,7 +40,9 @@ obj-$(CONFIG_PPLUS)           += pplus.o
 obj-$(CONFIG_PRPMC750)         += prpmc750.o
 obj-$(CONFIG_PRPMC800)         += prpmc800.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