Merge branch 'master'

[powerpc.git] / arch / powerpc / platforms / Makefile

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 697adde..8836b3a 100644 (file)
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -1,5 +1,14 @@
+ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_PMAC)         += powermac/
+else
+ifeq ($(CONFIG_PPC64),y)
+obj-$(CONFIG_PPC_PMAC)         += powermac/
+endif
+endif
+obj-$(CONFIG_PPC_CHRP)         += chrp/
 obj-$(CONFIG_4xx)              += 4xx/
-obj-$(CONFIG_83xx)             += 83xx/
 obj-$(CONFIG_85xx)             += 85xx/
+obj-$(CONFIG_PPC_PSERIES)      += pseries/
 obj-$(CONFIG_PPC_ISERIES)      += iseries/
+obj-$(CONFIG_PPC_MAPLE)                += maple/
+obj-$(CONFIG_PPC_CELL)         += cell/