Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 8836b3a..e58fa95 100644 (file)
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -7,8 +7,12 @@ endif
 endif
 obj-$(CONFIG_PPC_CHRP)         += chrp/
 obj-$(CONFIG_4xx)              += 4xx/
-obj-$(CONFIG_85xx)             += 85xx/
+obj-$(CONFIG_PPC_83xx)         += 83xx/
+obj-$(CONFIG_PPC_85xx)         += 85xx/
+obj-$(CONFIG_PPC_86xx)         += 86xx/
 obj-$(CONFIG_PPC_PSERIES)      += pseries/
 obj-$(CONFIG_PPC_ISERIES)      += iseries/
 obj-$(CONFIG_PPC_MAPLE)                += maple/
+obj-$(CONFIG_PPC_PASEMI)               += pasemi/
 obj-$(CONFIG_PPC_CELL)         += cell/
+obj-$(CONFIG_EMBEDDED6xx)      += embedded6xx/