aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/platforms/Makefile6
-rw-r--r--drivers/Makefile2
-rw-r--r--include/asm-powerpc/firmware.h4
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)
5obj-$(CONFIG_PPC_PMAC) += powermac/ 5obj-$(CONFIG_PPC_PMAC) += powermac/
6endif 6endif
7endif 7endif
8obj-$(CONFIG_PPC_EFIKA) += efika/ 8obj-$(CONFIG_PPC_EFIKA) += efika/
9obj-$(CONFIG_PPC_CHRP) += chrp/ 9obj-$(CONFIG_PPC_CHRP) += chrp/
10obj-$(CONFIG_4xx) += 4xx/ 10obj-$(CONFIG_4xx) += 4xx/
11obj-$(CONFIG_PPC_83xx) += 83xx/ 11obj-$(CONFIG_PPC_83xx) += 83xx/
@@ -14,7 +14,7 @@ obj-$(CONFIG_PPC_86xx) += 86xx/
14obj-$(CONFIG_PPC_PSERIES) += pseries/ 14obj-$(CONFIG_PPC_PSERIES) += pseries/
15obj-$(CONFIG_PPC_ISERIES) += iseries/ 15obj-$(CONFIG_PPC_ISERIES) += iseries/
16obj-$(CONFIG_PPC_MAPLE) += maple/ 16obj-$(CONFIG_PPC_MAPLE) += maple/
17obj-$(CONFIG_PPC_PASEMI) += pasemi/ 17obj-$(CONFIG_PPC_PASEMI) += pasemi/
18obj-$(CONFIG_PPC_CELL) += cell/ 18obj-$(CONFIG_PPC_CELL) += cell/
19obj-$(CONFIG_PS3) += ps3/ 19obj-$(CONFIG_PPC_PS3) += ps3/
20obj-$(CONFIG_EMBEDDED6xx) += embedded6xx/ 20obj-$(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/
77obj-$(CONFIG_SUPERH) += sh/ 77obj-$(CONFIG_SUPERH) += sh/
78obj-$(CONFIG_GENERIC_TIME) += clocksource/ 78obj-$(CONFIG_GENERIC_TIME) += clocksource/
79obj-$(CONFIG_DMA_ENGINE) += dma/ 79obj-$(CONFIG_DMA_ENGINE) += dma/
80obj-$(CONFIG_PS3) += ps3/ 80obj-$(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,