Merge branch 'linus' into cpus4096

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

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index d44e832..423a023 100644 (file)
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -9,8 +9,9 @@ obj-$(CONFIG_PPC_PMAC)          += powermac/
 endif
 endif
 obj-$(CONFIG_PPC_CHRP)         += chrp/
-#obj-$(CONFIG_4xx)             += 4xx/
+obj-$(CONFIG_40x)              += 40x/
 obj-$(CONFIG_44x)              += 44x/
+obj-$(CONFIG_PPC_MPC512x)      += 512x/
 obj-$(CONFIG_PPC_MPC52xx)      += 52xx/
 obj-$(CONFIG_PPC_8xx)          += 8xx/
 obj-$(CONFIG_PPC_82xx)         += 82xx/
@@ -23,5 +24,4 @@ obj-$(CONFIG_PPC_MAPLE)               += maple/
 obj-$(CONFIG_PPC_PASEMI)       += pasemi/
 obj-$(CONFIG_PPC_CELL)         += cell/
 obj-$(CONFIG_PPC_PS3)          += ps3/
-obj-$(CONFIG_PPC_CELLEB)       += celleb/
 obj-$(CONFIG_EMBEDDED6xx)      += embedded6xx/