* [PATCH] Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3
@ 2006-11-23 12:50 Geert Uytterhoeven
2006-11-23 13:09 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2006-11-23 12:50 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Linux/PPC Development
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>
Index: ps3-linux-src/arch/powerpc/platforms/Makefile
===================================================================
--- ps3-linux-src.orig/arch/powerpc/platforms/Makefile 2006-11-23 13:42:46.000000000 +0100
+++ ps3-linux-src/arch/powerpc/platforms/Makefile 2006-11-23 13:42:49.000000000 +0100
@@ -5,7 +5,7 @@
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_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/
Index: ps3-linux-src/drivers/Makefile
===================================================================
--- ps3-linux-src.orig/drivers/Makefile 2006-11-23 13:42:46.000000000 +0100
+++ ps3-linux-src/drivers/Makefile 2006-11-23 13:42:49.000000000 +0100
@@ -77,4 +77,4 @@
obj-$(CONFIG_SUPERH) += sh/
obj-$(CONFIG_GENERIC_TIME) += clocksource/
obj-$(CONFIG_DMA_ENGINE) += dma/
-obj-$(CONFIG_PS3) += ps3/
+obj-$(CONFIG_PPC_PS3) += ps3/
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3
2006-11-23 12:50 [PATCH] Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3 Geert Uytterhoeven
@ 2006-11-23 13:09 ` Arnd Bergmann
2006-11-23 14:32 ` Geert Uytterhoeven
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2006-11-23 13:09 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Geert Uytterhoeven, Paul Mackerras
On Thursday 23 November 2006 13:50, Geert Uytterhoeven wrote:
>
> When renaming CONFIG_PS3 to CONFIG_PPC_PS3, a few occurrences have been
> missed.
Sorry about this, my fault. I checked the Kconfig and .c files, but
missed the Makefiles.
> I also fixed up the alignment in arch/powerpc/platforms/Makefile.
>
> Signed-Off-By: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3
2006-11-23 13:09 ` Arnd Bergmann
@ 2006-11-23 14:32 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2006-11-23 14:32 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linuxppc-dev, Paul Mackerras
On Thu, 23 Nov 2006, Arnd Bergmann wrote:
> On Thursday 23 November 2006 13:50, Geert Uytterhoeven wrote:
> > When renaming CONFIG_PS3 to CONFIG_PPC_PS3, a few occurrences have been
> > missed.
>
> Sorry about this, my fault. I checked the Kconfig and .c files, but
> missed the Makefiles.
Bummer, I found another one in <asm/firmware.h> (he who uses `grep
CONFIG_PS3[^_])' doesn't match end of lines), which explains why the resulting
kernel didn't boot that far...
I'll send an updated patch in a few minutes.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3
@ 2006-11-23 14:33 Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2006-11-23 14:33 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Linux/PPC Development, Arnd Bergmann
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>
Index: ps3-linux-src/arch/powerpc/platforms/Makefile
===================================================================
--- ps3-linux-src.orig/arch/powerpc/platforms/Makefile 2006-11-23 13:42:46.000000000 +0100
+++ ps3-linux-src/arch/powerpc/platforms/Makefile 2006-11-23 13:42:49.000000000 +0100
@@ -5,7 +5,7 @@
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_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/
Index: ps3-linux-src/drivers/Makefile
===================================================================
--- ps3-linux-src.orig/drivers/Makefile 2006-11-23 13:42:46.000000000 +0100
+++ ps3-linux-src/drivers/Makefile 2006-11-23 13:42:49.000000000 +0100
@@ -77,4 +77,4 @@
obj-$(CONFIG_SUPERH) += sh/
obj-$(CONFIG_GENERIC_TIME) += clocksource/
obj-$(CONFIG_DMA_ENGINE) += dma/
-obj-$(CONFIG_PS3) += ps3/
+obj-$(CONFIG_PPC_PS3) += ps3/
Index: ps3-linux-src/include/asm-powerpc/firmware.h
===================================================================
--- ps3-linux-src.orig/include/asm-powerpc/firmware.h 2006-11-23 10:57:53.000000000 +0100
+++ ps3-linux-src/include/asm-powerpc/firmware.h 2006-11-23 15:12:45.000000000 +0100
@@ -67,7 +67,7 @@
#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 @@
#ifdef CONFIG_PPC_ISERIES
FW_FEATURE_ISERIES_ALWAYS &
#endif
-#ifdef CONFIG_PS3
+#ifdef CONFIG_PPC_PS3
FW_FEATURE_PS3_ALWAYS &
#endif
FW_FEATURE_POSSIBLE,
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-11-23 14:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-23 12:50 [PATCH] Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3 Geert Uytterhoeven
2006-11-23 13:09 ` Arnd Bergmann
2006-11-23 14:32 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2006-11-23 14:33 Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).