Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb30c720 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Paul Mackerras
Browse files

[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: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
parent e055595d

arch/powerpc/platforms/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ obj-$(CONFIG_PPC_ISERIES) += iseries/ 
obj-$(CONFIG_PPC_MAPLE)		+= maple/

obj-$(CONFIG_PPC_PASEMI)	+= pasemi/

obj-$(CONFIG_PPC_CELL)		+= cell/

obj-$(CONFIG_PS3)		+= ps3/

obj-$(CONFIG_PPC_PS3)		+= ps3/

obj-$(CONFIG_EMBEDDED6xx)	+= embedded6xx/

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

include/asm-powerpc/firmware.h

+2 −2
Original line number Diff line number Diff line
@@ -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,