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