Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit eb30c72026500f9efa9bb23ab2393d6a9e36c5e1

Authored by Geert Uytterhoeven
Committed by Paul Mackerras
1 parent e055595d3e
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 3 changed files with 6 additions and 6 deletions Side-by-side Diff

arch/powerpc/platforms/Makefile
Diff comments   View file @ eb30c72
... ... @@ -5,7 +5,7 @@
5 5 obj-$(CONFIG_PPC_PMAC) += powermac/
6 6 endif
7 7 endif
8   -obj-$(CONFIG_PPC_EFIKA) += efika/
  8 +obj-$(CONFIG_PPC_EFIKA) += efika/
9 9 obj-$(CONFIG_PPC_CHRP) += chrp/
10 10 obj-$(CONFIG_4xx) += 4xx/
11 11 obj-$(CONFIG_PPC_83xx) += 83xx/
12 12  
... ... @@ -14,8 +14,8 @@
14 14 obj-$(CONFIG_PPC_PSERIES) += pseries/
15 15 obj-$(CONFIG_PPC_ISERIES) += iseries/
16 16 obj-$(CONFIG_PPC_MAPLE) += maple/
17   -obj-$(CONFIG_PPC_PASEMI) += pasemi/
  17 +obj-$(CONFIG_PPC_PASEMI) += pasemi/
18 18 obj-$(CONFIG_PPC_CELL) += cell/
19   -obj-$(CONFIG_PS3) += ps3/
  19 +obj-$(CONFIG_PPC_PS3) += ps3/
20 20 obj-$(CONFIG_EMBEDDED6xx) += embedded6xx/
... ... @@ -77,5 +77,5 @@
77 77 obj-$(CONFIG_SUPERH) += sh/
78 78 obj-$(CONFIG_GENERIC_TIME) += clocksource/
79 79 obj-$(CONFIG_DMA_ENGINE) += dma/
80   -obj-$(CONFIG_PS3) += ps3/
  80 +obj-$(CONFIG_PPC_PS3) += ps3/
include/asm-powerpc/firmware.h
Diff comments   View file @ eb30c72
... ... @@ -67,7 +67,7 @@
67 67 #ifdef CONFIG_PPC_ISERIES
68 68 FW_FEATURE_ISERIES_POSSIBLE |
69 69 #endif
70   -#ifdef CONFIG_PS3
  70 +#ifdef CONFIG_PPC_PS3
71 71 FW_FEATURE_PS3_POSSIBLE |
72 72 #endif
73 73 0,
... ... @@ -78,7 +78,7 @@
78 78 #ifdef CONFIG_PPC_ISERIES
79 79 FW_FEATURE_ISERIES_ALWAYS &
80 80 #endif
81   -#ifdef CONFIG_PS3
  81 +#ifdef CONFIG_PPC_PS3
82 82 FW_FEATURE_PS3_ALWAYS &
83 83 #endif
84 84 FW_FEATURE_POSSIBLE,