[POWERPC] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3

When renaming CONFIG_PS3 to CONFIG_PPC_PS3, a few occurrences have been
missed.

I also fixed up the alignment in arch/powerpc/platforms/Makefile.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 56caf4fbd730..52984a803e7c 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -5,7 +5,7 @@ ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_PPC_PMAC)          += powermac/
 endif
 endif
-obj-$(CONFIG_PPC_EFIKA)          += efika/
+obj-$(CONFIG_PPC_EFIKA)         += efika/
 obj-$(CONFIG_PPC_CHRP)          += chrp/
 obj-$(CONFIG_4xx)               += 4xx/
 obj-$(CONFIG_PPC_83xx)          += 83xx/
@@ -14,7 +14,7 @@ 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_PASEMI)        += pasemi/
 obj-$(CONFIG_PPC_CELL)          += cell/
-obj-$(CONFIG_PS3)               += ps3/
+obj-$(CONFIG_PPC_PS3)           += ps3/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
diff --git a/drivers/Makefile b/drivers/Makefile
index a47d2483b7a9..67711770b1d9 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -77,4 +77,4 @@ obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)            += sh/
 obj-$(CONFIG_GENERIC_TIME)      += clocksource/
 obj-$(CONFIG_DMA_ENGINE)        += dma/
-obj-$(CONFIG_PS3)               += ps3/
+obj-$(CONFIG_PPC_PS3)           += ps3/
diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
index d1011b892d56..84d43d6e13ec 100644
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
@@ -67,7 +67,7 @@ enum {
 #ifdef CONFIG_PPC_ISERIES
                 FW_FEATURE_ISERIES_POSSIBLE |
 #endif
-#ifdef CONFIG_PS3
+#ifdef CONFIG_PPC_PS3
                 FW_FEATURE_PS3_POSSIBLE |
 #endif
                 0,
@@ -78,7 +78,7 @@ enum {
 #ifdef CONFIG_PPC_ISERIES
                 FW_FEATURE_ISERIES_ALWAYS &
 #endif
-#ifdef CONFIG_PS3
+#ifdef CONFIG_PPC_PS3
                 FW_FEATURE_PS3_ALWAYS &
 #endif
                 FW_FEATURE_POSSIBLE,