4 files changed, 10 insertions, 10 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 967ecf92d6a7..0bd315de156b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -319,8 +319,8 @@ config PPC_MAPLE
           This option enables support for the Maple 970FX Evaluation Board.
           For more informations, refer to <http://www.970eval.com>
 
-config PPC_BPA
-        bool "  Broadband Processor Architecture"
+config PPC_CELL
+        bool "  Cell Broadband Processor Architecture"
         depends on PPC_MULTIPLATFORM && PPC64
         select PPC_RTAS
 
@@ -358,8 +358,8 @@ config MPIC_BROKEN_U3
         depends on PPC_MAPLE
         default y
 
-config BPA_IIC
-        depends on PPC_BPA
+config CELL_IIC
+        depends on PPC_CELL
         bool
         default y
 
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 9750b3cd8ecd..c758b6624d7b 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2000,7 +2000,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
 #endif
 
         /*
-         * On pSeries and BPA, copy the CPU hold code
+         * Copy the CPU hold code
          */
         if (RELOC(of_platform) != PLATFORM_POWERMAC)
                 copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 19530ce9cd27..70ead7d0d12e 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -296,7 +296,7 @@ static void __init setup_cpu_maps(void)
 extern struct machdep_calls pSeries_md;
 extern struct machdep_calls pmac_md;
 extern struct machdep_calls maple_md;
-extern struct machdep_calls bpa_md;
+extern struct machdep_calls cell_md;
 extern struct machdep_calls iseries_md;
 
 /* Ultimately, stuff them in an elf section like initcalls... */
@@ -310,8 +310,8 @@ static struct machdep_calls __initdata *machines[] = {
 #ifdef CONFIG_PPC_MAPLE
         &maple_md,
 #endif /* CONFIG_PPC_MAPLE */
-#ifdef CONFIG_PPC_BPA
-        &bpa_md,
+#ifdef CONFIG_PPC_CELL
+        &cell_md,
 #endif
 #ifdef CONFIG_PPC_ISERIES
         &iseries_md,
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 5d638ecddbd0..bb0d00284a7e 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -147,8 +147,8 @@ int die(const char *str, struct pt_regs *regs, long err)
                 printk("POWERMAC ");
                 nl = 1;
                 break;
-        case PLATFORM_BPA:
-                printk("BPA ");
+        case PLATFORM_CELL:
+                printk("CELL ");
                 nl = 1;
                 break;
         }