linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>,
	linuxppc-dev@ozlabs.org, cbe-oss-dev@ozlabs.org,
	Arnd Bergmann <arnd.bergmann@de.ibm.com>
Subject: [POWERPC 5/9] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3
Date: Mon, 27 Nov 2006 19:18:56 +0100	[thread overview]
Message-ID: <20061127182430.940888000@arndb.de> (raw)
In-Reply-To: 20061127181851.796747000@arndb.de

From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
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>
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

--

  parent reply	other threads:[~2006-11-27 18:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-27 18:18 [POWERPC 0/9] cell bug fixes for 2.6.20 Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 1/9] spufs: return an error in spu_create is isolated create isnt supported Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 2/9] spufs: always send sigtrap on breakpoint Arnd Bergmann
2006-11-28  0:12   ` Luke Browning
2006-11-28  0:29     ` Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 3/9] spufs: we should only execute init_spu_base on cell Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 4/9] cell: fix building without spufs Arnd Bergmann
2006-11-27 18:18 ` Arnd Bergmann [this message]
2006-11-28  0:40   ` [POWERPC 5/9] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3 Geoff Levand
2006-11-27 18:18 ` [POWERPC 6/9] ps3: multiplatform build fixes Arnd Bergmann
2006-11-28 21:05   ` [Cbe-oss-dev] " Geoff Levand
2006-11-27 18:18 ` [POWERPC 7/9] ps3: add a default zImage target Arnd Bergmann
2006-11-28  0:59   ` Geoff Levand
2006-11-27 18:18 ` [POWERPC 8/9] fix missing #include in sys_ppc32.c Arnd Bergmann
2006-11-27 18:19 ` [POWERPC 9/9] fix building without PCI Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061127182430.940888000@arndb.de \
    --to=arnd@arndb.de \
    --cc=Geert.Uytterhoeven@sonycom.com \
    --cc=arnd.bergmann@de.ibm.com \
    --cc=cbe-oss-dev@ozlabs.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).