Move arch/ppc to arch/powerpc

As discussed on the list, move "arch/ppc" to "arch/powerpc" to better match the Linux directory structure. Please note that this patch also changes the "ppc" target in MAKEALL to "powerpc" to match this new infrastructure. But "ppc" is kept as an alias for now, to not break compatibility with scripts using this name. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de> Acked-by: Kim Phillips <kim.phillips@freescale.com> Cc: Peter Tyser <ptyser@xes-inc.com> Cc: Anatolij Gustschin <agust@denx.de>
author: Stefan Roese <sr@denx.de> 2010-04-15 16:07:28 +0200
committer: Wolfgang Denk <wd@denx.de> 2010-04-21 23:42:38 +0200
commit: a47a12becf66f02a56da91c161e2edb625e9f20c (patch)
tree: 6efae7137d26d1e610c5fd56b7aaa3c043ad2b71 /arch
parent: 254ab7bd464657600aba69d840406f9358f3e116 (diff)
336 files changed, 60 insertions, 60 deletions
diff --git a/arch/ppc/config.mk b/arch/powerpc/config.mk
index 06a3b107d5..06a3b107d5 100644
--- a/arch/ppc/config.mk
+++ b/arch/powerpc/config.mk
diff --git a/arch/ppc/cpu/74xx_7xx/Makefile b/arch/powerpc/cpu/74xx_7xx/Makefile
index fe905f31fe..fe905f31fe 100644
--- a/arch/ppc/cpu/74xx_7xx/Makefile
+++ b/arch/powerpc/cpu/74xx_7xx/Makefile
diff --git a/arch/ppc/cpu/74xx_7xx/cache.S b/arch/powerpc/cpu/74xx_7xx/cache.S
index 66c72983d4..66c72983d4 100644
--- a/arch/ppc/cpu/74xx_7xx/cache.S
+++ b/arch/powerpc/cpu/74xx_7xx/cache.S
diff --git a/arch/ppc/cpu/74xx_7xx/config.mk b/arch/powerpc/cpu/74xx_7xx/config.mk
index df1f6acedf..df1f6acedf 100644
--- a/arch/ppc/cpu/74xx_7xx/config.mk
+++ b/arch/powerpc/cpu/74xx_7xx/config.mk
diff --git a/arch/ppc/cpu/74xx_7xx/cpu.c b/arch/powerpc/cpu/74xx_7xx/cpu.c
index 3c172779b1..3c172779b1 100644
--- a/arch/ppc/cpu/74xx_7xx/cpu.c
+++ b/arch/powerpc/cpu/74xx_7xx/cpu.c
diff --git a/arch/ppc/cpu/74xx_7xx/cpu_init.c b/arch/powerpc/cpu/74xx_7xx/cpu_init.c
index 1dd1b2cd84..1dd1b2cd84 100644
--- a/arch/ppc/cpu/74xx_7xx/cpu_init.c
+++ b/arch/powerpc/cpu/74xx_7xx/cpu_init.c
diff --git a/arch/ppc/cpu/74xx_7xx/interrupts.c b/arch/powerpc/cpu/74xx_7xx/interrupts.c
index 0ea1aec7a6..0ea1aec7a6 100644
--- a/arch/ppc/cpu/74xx_7xx/interrupts.c
+++ b/arch/powerpc/cpu/74xx_7xx/interrupts.c
diff --git a/arch/ppc/cpu/74xx_7xx/io.S b/arch/powerpc/cpu/74xx_7xx/io.S
index af2e6d12fb..af2e6d12fb 100644
--- a/arch/ppc/cpu/74xx_7xx/io.S
+++ b/arch/powerpc/cpu/74xx_7xx/io.S
diff --git a/arch/ppc/cpu/74xx_7xx/kgdb.S b/arch/powerpc/cpu/74xx_7xx/kgdb.S
index ad487cdaf4..ad487cdaf4 100644
--- a/arch/ppc/cpu/74xx_7xx/kgdb.S
+++ b/arch/powerpc/cpu/74xx_7xx/kgdb.S
diff --git a/arch/ppc/cpu/74xx_7xx/speed.c b/arch/powerpc/cpu/74xx_7xx/speed.c
index f2fdcd5dc3..f2fdcd5dc3 100644
--- a/arch/ppc/cpu/74xx_7xx/speed.c
+++ b/arch/powerpc/cpu/74xx_7xx/speed.c
diff --git a/arch/ppc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S
index 88fdf88c34..88fdf88c34 100644
--- a/arch/ppc/cpu/74xx_7xx/start.S
+++ b/arch/powerpc/cpu/74xx_7xx/start.S
diff --git a/arch/ppc/cpu/74xx_7xx/traps.c b/arch/powerpc/cpu/74xx_7xx/traps.c
index 1d5dd017ef..5073b0516d 100644
--- a/arch/ppc/cpu/74xx_7xx/traps.c
+++ b/arch/powerpc/cpu/74xx_7xx/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/mpc512x/Makefile b/arch/powerpc/cpu/mpc512x/Makefile
index 1719c66e8d..1719c66e8d 100644
--- a/arch/ppc/cpu/mpc512x/Makefile
+++ b/arch/powerpc/cpu/mpc512x/Makefile
diff --git a/arch/ppc/cpu/mpc512x/asm-offsets.h b/arch/powerpc/cpu/mpc512x/asm-offsets.h
index 5873fe05ec..957d4be2d2 100644
--- a/arch/ppc/cpu/mpc512x/asm-offsets.h
+++ b/arch/powerpc/cpu/mpc512x/asm-offsets.h
@@ -1,5 +1,5 @@
 /*
- * needed for arch/ppc/cpu/mpc512x/start.S
+ * needed for arch/powerpc/cpu/mpc512x/start.S
  *
  * These should be auto-generated
  */
diff --git a/arch/ppc/cpu/mpc512x/config.mk b/arch/powerpc/cpu/mpc512x/config.mk
index b6727dcd21..b29edb1b38 100644
--- a/arch/ppc/cpu/mpc512x/config.mk
+++ b/arch/powerpc/cpu/mpc512x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
 
 # Use default linker script.
 # A board port can override this setting in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc512x/u-boot.lds
diff --git a/arch/ppc/cpu/mpc512x/cpu.c b/arch/powerpc/cpu/mpc512x/cpu.c
index 09cbd2024d..09cbd2024d 100644
--- a/arch/ppc/cpu/mpc512x/cpu.c
+++ b/arch/powerpc/cpu/mpc512x/cpu.c
diff --git a/arch/ppc/cpu/mpc512x/cpu_init.c b/arch/powerpc/cpu/mpc512x/cpu_init.c
index fe6beaf84d..fe6beaf84d 100644
--- a/arch/ppc/cpu/mpc512x/cpu_init.c
+++ b/arch/powerpc/cpu/mpc512x/cpu_init.c
diff --git a/arch/ppc/cpu/mpc512x/diu.c b/arch/powerpc/cpu/mpc512x/diu.c
index 93611615f1..93611615f1 100644
--- a/arch/ppc/cpu/mpc512x/diu.c
+++ b/arch/powerpc/cpu/mpc512x/diu.c
diff --git a/arch/ppc/cpu/mpc512x/fixed_sdram.c b/arch/powerpc/cpu/mpc512x/fixed_sdram.c
index 442b5fc918..442b5fc918 100644
--- a/arch/ppc/cpu/mpc512x/fixed_sdram.c
+++ b/arch/powerpc/cpu/mpc512x/fixed_sdram.c
diff --git a/arch/ppc/cpu/mpc512x/i2c.c b/arch/powerpc/cpu/mpc512x/i2c.c
index e2d909751e..e2d909751e 100644
--- a/arch/ppc/cpu/mpc512x/i2c.c
+++ b/arch/powerpc/cpu/mpc512x/i2c.c
diff --git a/arch/ppc/cpu/mpc512x/ide.c b/arch/powerpc/cpu/mpc512x/ide.c
index dd6b2f4673..dd6b2f4673 100644
--- a/arch/ppc/cpu/mpc512x/ide.c
+++ b/arch/powerpc/cpu/mpc512x/ide.c
diff --git a/arch/ppc/cpu/mpc512x/iim.c b/arch/powerpc/cpu/mpc512x/iim.c
index 8f2eb37e17..8f2eb37e17 100644
--- a/arch/ppc/cpu/mpc512x/iim.c
+++ b/arch/powerpc/cpu/mpc512x/iim.c
diff --git a/arch/ppc/cpu/mpc512x/interrupts.c b/arch/powerpc/cpu/mpc512x/interrupts.c
index ef7c773b2b..ef7c773b2b 100644
--- a/arch/ppc/cpu/mpc512x/interrupts.c
+++ b/arch/powerpc/cpu/mpc512x/interrupts.c
diff --git a/arch/ppc/cpu/mpc512x/iopin.c b/arch/powerpc/cpu/mpc512x/iopin.c
index be20947623..be20947623 100644
--- a/arch/ppc/cpu/mpc512x/iopin.c
+++ b/arch/powerpc/cpu/mpc512x/iopin.c
diff --git a/arch/ppc/cpu/mpc512x/pci.c b/arch/powerpc/cpu/mpc512x/pci.c
index 141db8b865..141db8b865 100644
--- a/arch/ppc/cpu/mpc512x/pci.c
+++ b/arch/powerpc/cpu/mpc512x/pci.c
diff --git a/arch/ppc/cpu/mpc512x/serial.c b/arch/powerpc/cpu/mpc512x/serial.c
index ec2f41bb36..ec2f41bb36 100644
--- a/arch/ppc/cpu/mpc512x/serial.c
+++ b/arch/powerpc/cpu/mpc512x/serial.c
diff --git a/arch/ppc/cpu/mpc512x/speed.c b/arch/powerpc/cpu/mpc512x/speed.c
index ce8d0949b2..ce8d0949b2 100644
--- a/arch/ppc/cpu/mpc512x/speed.c
+++ b/arch/powerpc/cpu/mpc512x/speed.c
diff --git a/arch/ppc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S
index d26b61707e..d26b61707e 100644
--- a/arch/ppc/cpu/mpc512x/start.S
+++ b/arch/powerpc/cpu/mpc512x/start.S
diff --git a/arch/ppc/cpu/mpc512x/traps.c b/arch/powerpc/cpu/mpc512x/traps.c
index 786f4a5a7e..786f4a5a7e 100644
--- a/arch/ppc/cpu/mpc512x/traps.c
+++ b/arch/powerpc/cpu/mpc512x/traps.c
diff --git a/arch/ppc/cpu/mpc512x/u-boot.lds b/arch/powerpc/cpu/mpc512x/u-boot.lds
index fbc2026d53..c71679960c 100644
--- a/arch/ppc/cpu/mpc512x/u-boot.lds
+++ b/arch/powerpc/cpu/mpc512x/u-boot.lds
@@ -49,7 +49,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc512x/start.o	(.text)
+    arch/powerpc/cpu/mpc512x/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc5xx/Makefile b/arch/powerpc/cpu/mpc5xx/Makefile
index f2ebb9a123..80c53203e9 100644
--- a/arch/ppc/cpu/mpc5xx/Makefile
+++ b/arch/powerpc/cpu/mpc5xx/Makefile
@@ -25,11 +25,11 @@
 #
 
 #
-# File:			arch/ppc/cpu/mpc5xx/Makefile
+# File:			arch/powerpc/cpu/mpc5xx/Makefile
 #
 # Discription:		Makefile to build mpc5xx cpu configuration.
 #			Will include top config.mk which itselfs
-#			uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk
+#			uses the definitions made in arch/powerpc/cpu/mpc5xx/config.mk
 #
 
 
diff --git a/arch/ppc/cpu/mpc5xx/config.mk b/arch/powerpc/cpu/mpc5xx/config.mk
index e0b0ce1fd5..5f9285df49 100644
--- a/arch/ppc/cpu/mpc5xx/config.mk
+++ b/arch/powerpc/cpu/mpc5xx/config.mk
@@ -33,4 +33,4 @@ PLATFORM_RELFLAGS +=	-fPIC -meabi
 PLATFORM_CPPFLAGS +=	-DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc5xx/cpu.c b/arch/powerpc/cpu/mpc5xx/cpu.c
index 7fffebcc1e..7fffebcc1e 100644
--- a/arch/ppc/cpu/mpc5xx/cpu.c
+++ b/arch/powerpc/cpu/mpc5xx/cpu.c
diff --git a/arch/ppc/cpu/mpc5xx/cpu_init.c b/arch/powerpc/cpu/mpc5xx/cpu_init.c
index cb4bf84737..cb4bf84737 100644
--- a/arch/ppc/cpu/mpc5xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc5xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc5xx/interrupts.c b/arch/powerpc/cpu/mpc5xx/interrupts.c
index 167543fcf5..167543fcf5 100644
--- a/arch/ppc/cpu/mpc5xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc5xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc5xx/serial.c b/arch/powerpc/cpu/mpc5xx/serial.c
index 88c6db81cb..88c6db81cb 100644
--- a/arch/ppc/cpu/mpc5xx/serial.c
+++ b/arch/powerpc/cpu/mpc5xx/serial.c
diff --git a/arch/ppc/cpu/mpc5xx/speed.c b/arch/powerpc/cpu/mpc5xx/speed.c
index ea5c1dead5..ea5c1dead5 100644
--- a/arch/ppc/cpu/mpc5xx/speed.c
+++ b/arch/powerpc/cpu/mpc5xx/speed.c
diff --git a/arch/ppc/cpu/mpc5xx/spi.c b/arch/powerpc/cpu/mpc5xx/spi.c
index 3ca15ea838..3ca15ea838 100644
--- a/arch/ppc/cpu/mpc5xx/spi.c
+++ b/arch/powerpc/cpu/mpc5xx/spi.c
diff --git a/arch/ppc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S
index 0af879e391..0af879e391 100644
--- a/arch/ppc/cpu/mpc5xx/start.S
+++ b/arch/powerpc/cpu/mpc5xx/start.S
diff --git a/arch/ppc/cpu/mpc5xx/traps.c b/arch/powerpc/cpu/mpc5xx/traps.c
index 6882c21a41..e3ce11b2b3 100644
--- a/arch/ppc/cpu/mpc5xx/traps.c
+++ b/arch/powerpc/cpu/mpc5xx/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/mpc5xx/u-boot.lds b/arch/powerpc/cpu/mpc5xx/u-boot.lds
index 55190c72d9..d5e5dc1787 100644
--- a/arch/ppc/cpu/mpc5xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    arch/ppc/cpu/mpc5xx/start.o	(.text)
+    arch/powerpc/cpu/mpc5xx/start.o	(.text)
 
     *(.text)
     *(.got1)
diff --git a/arch/ppc/cpu/mpc5xxx/Makefile b/arch/powerpc/cpu/mpc5xxx/Makefile
index 0ee0611550..0ee0611550 100644
--- a/arch/ppc/cpu/mpc5xxx/Makefile
+++ b/arch/powerpc/cpu/mpc5xxx/Makefile
diff --git a/arch/ppc/cpu/mpc5xxx/config.mk b/arch/powerpc/cpu/mpc5xxx/config.mk
index 9a64cb623d..7ef8a4708a 100644
--- a/arch/ppc/cpu/mpc5xxx/config.mk
+++ b/arch/powerpc/cpu/mpc5xxx/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c
index b20234d32e..b20234d32e 100644
--- a/arch/ppc/cpu/mpc5xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc5xxx/cpu.c
diff --git a/arch/ppc/cpu/mpc5xxx/cpu_init.c b/arch/powerpc/cpu/mpc5xxx/cpu_init.c
index 9daf3755ac..9daf3755ac 100644
--- a/arch/ppc/cpu/mpc5xxx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc5xxx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S b/arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
index 00c23121ac..00c23121ac 100644
--- a/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
+++ b/arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
diff --git a/arch/ppc/cpu/mpc5xxx/i2c.c b/arch/powerpc/cpu/mpc5xxx/i2c.c
index 4f7f716328..4f7f716328 100644
--- a/arch/ppc/cpu/mpc5xxx/i2c.c
+++ b/arch/powerpc/cpu/mpc5xxx/i2c.c
diff --git a/arch/ppc/cpu/mpc5xxx/ide.c b/arch/powerpc/cpu/mpc5xxx/ide.c
index d337abb1c9..d337abb1c9 100644
--- a/arch/ppc/cpu/mpc5xxx/ide.c
+++ b/arch/powerpc/cpu/mpc5xxx/ide.c
diff --git a/arch/ppc/cpu/mpc5xxx/interrupts.c b/arch/powerpc/cpu/mpc5xxx/interrupts.c
index 6035771eeb..16eee3a480 100644
--- a/arch/ppc/cpu/mpc5xxx/interrupts.c
+++ b/arch/powerpc/cpu/mpc5xxx/interrupts.c
@@ -27,7 +27,7 @@
  * MA 02111-1307 USA
  */
 
-/* this section was ripped out of arch/ppc/syslib/mpc52xx_pic.c in the
+/* this section was ripped out of arch/powerpc/syslib/mpc52xx_pic.c in the
  * Linux 2.6 source with the following copyright.
  *
  * Based on (well, mostly copied from) the code from the 2.4 kernel by
diff --git a/arch/ppc/cpu/mpc5xxx/io.S b/arch/powerpc/cpu/mpc5xxx/io.S
index 2178a26763..2178a26763 100644
--- a/arch/ppc/cpu/mpc5xxx/io.S
+++ b/arch/powerpc/cpu/mpc5xxx/io.S
diff --git a/arch/ppc/cpu/mpc5xxx/loadtask.c b/arch/powerpc/cpu/mpc5xxx/loadtask.c
index 47e7b596a6..47e7b596a6 100644
--- a/arch/ppc/cpu/mpc5xxx/loadtask.c
+++ b/arch/powerpc/cpu/mpc5xxx/loadtask.c
diff --git a/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c b/arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c
index 8268f8afe1..8268f8afe1 100644
--- a/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c
+++ b/arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c
diff --git a/arch/ppc/cpu/mpc5xxx/serial.c b/arch/powerpc/cpu/mpc5xxx/serial.c
index 66759887c6..59a877a8f9 100644
--- a/arch/ppc/cpu/mpc5xxx/serial.c
+++ b/arch/powerpc/cpu/mpc5xxx/serial.c
@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  *
  * Hacked for MPC8260 by Murray.Jensen@cmst.csiro.au, 19-Oct-00, with
- * changes based on the file arch/ppc/mbxboot/m8260_tty.c from the
+ * changes based on the file arch/powerpc/mbxboot/m8260_tty.c from the
  * Linux/PPC sources (m8260_tty.c had no copyright info in it).
  *
  * Martin Krause, 8 Jun 2006
diff --git a/arch/ppc/cpu/mpc5xxx/speed.c b/arch/powerpc/cpu/mpc5xxx/speed.c
index 8027d3e08a..8027d3e08a 100644
--- a/arch/ppc/cpu/mpc5xxx/speed.c
+++ b/arch/powerpc/cpu/mpc5xxx/speed.c
diff --git a/arch/ppc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S
index ba49944210..8b9f09b39d 100644
--- a/arch/ppc/cpu/mpc5xxx/start.S
+++ b/arch/powerpc/cpu/mpc5xxx/start.S
@@ -442,7 +442,7 @@ init_5xxx_core:
 	/*								*/
 	/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000	*/
 	/* incrementing by 0x1000 each time. The code below is sort of	*/
-	/* based on code in "flush_tlbs" from arch/ppc/kernel/head.S	*/
+	/* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S	*/
 	/*								*/
 	/*--------------------------------------------------------------*/
 
diff --git a/arch/ppc/cpu/mpc5xxx/traps.c b/arch/powerpc/cpu/mpc5xxx/traps.c
index 934a2f2ab0..5972f34579 100644
--- a/arch/ppc/cpu/mpc5xxx/traps.c
+++ b/arch/powerpc/cpu/mpc5xxx/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
index 81ebde987f..ecffc1b32f 100644
--- a/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -55,11 +55,11 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within  */
     /* the sector layout of our flash chips!    XXX FIXME XXX   */
 
-    arch/ppc/cpu/mpc5xxx/start.o          (.text)
-    arch/ppc/cpu/mpc5xxx/traps.o          (.text)
+    arch/powerpc/cpu/mpc5xxx/start.o          (.text)
+    arch/powerpc/cpu/mpc5xxx/traps.o          (.text)
     lib/crc32.o         (.text)
-    arch/ppc/lib/cache.o             (.text)
-    arch/ppc/lib/time.o              (.text)
+    arch/powerpc/lib/cache.o             (.text)
+    arch/powerpc/lib/time.o              (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o        (.ppcenv)
diff --git a/arch/ppc/cpu/mpc5xxx/u-boot.lds b/arch/powerpc/cpu/mpc5xxx/u-boot.lds
index 64ef481297..ea4060d482 100644
--- a/arch/ppc/cpu/mpc5xxx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc5xxx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc5xxx/start.o	(.text)
+    arch/powerpc/cpu/mpc5xxx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc5xxx/usb.c b/arch/powerpc/cpu/mpc5xxx/usb.c
index bec7da3eab..bec7da3eab 100644
--- a/arch/ppc/cpu/mpc5xxx/usb.c
+++ b/arch/powerpc/cpu/mpc5xxx/usb.c
diff --git a/arch/ppc/cpu/mpc5xxx/usb_ohci.c b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
index 7976e4df7d..7976e4df7d 100644
--- a/arch/ppc/cpu/mpc5xxx/usb_ohci.c
+++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
diff --git a/arch/ppc/cpu/mpc5xxx/usb_ohci.h b/arch/powerpc/cpu/mpc5xxx/usb_ohci.h
index 629b529a69..629b529a69 100644
--- a/arch/ppc/cpu/mpc5xxx/usb_ohci.h
+++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.h
diff --git a/arch/ppc/cpu/mpc8220/Makefile b/arch/powerpc/cpu/mpc8220/Makefile
index b4fad286dc..b4fad286dc 100644
--- a/arch/ppc/cpu/mpc8220/Makefile
+++ b/arch/powerpc/cpu/mpc8220/Makefile
diff --git a/arch/ppc/cpu/mpc8220/config.mk b/arch/powerpc/cpu/mpc8220/config.mk
index e2ebf38bd5..e706883938 100644
--- a/arch/ppc/cpu/mpc8220/config.mk
+++ b/arch/powerpc/cpu/mpc8220/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc8220/u-boot.lds
diff --git a/arch/ppc/cpu/mpc8220/cpu.c b/arch/powerpc/cpu/mpc8220/cpu.c
index 563cfe0536..563cfe0536 100644
--- a/arch/ppc/cpu/mpc8220/cpu.c
+++ b/arch/powerpc/cpu/mpc8220/cpu.c
diff --git a/arch/ppc/cpu/mpc8220/cpu_init.c b/arch/powerpc/cpu/mpc8220/cpu_init.c
index 8f52c7dd0e..8f52c7dd0e 100644
--- a/arch/ppc/cpu/mpc8220/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8220/cpu_init.c
diff --git a/arch/ppc/cpu/mpc8220/dma.h b/arch/powerpc/cpu/mpc8220/dma.h
index d06ee63139..d06ee63139 100644
--- a/arch/ppc/cpu/mpc8220/dma.h
+++ b/arch/powerpc/cpu/mpc8220/dma.h
diff --git a/arch/ppc/cpu/mpc8220/dramSetup.c b/arch/powerpc/cpu/mpc8220/dramSetup.c
index 52cf1333f7..52cf1333f7 100644
--- a/arch/ppc/cpu/mpc8220/dramSetup.c
+++ b/arch/powerpc/cpu/mpc8220/dramSetup.c
diff --git a/arch/ppc/cpu/mpc8220/dramSetup.h b/arch/powerpc/cpu/mpc8220/dramSetup.h
index 3b64e088cd..3b64e088cd 100644
--- a/arch/ppc/cpu/mpc8220/dramSetup.h
+++ b/arch/powerpc/cpu/mpc8220/dramSetup.h
diff --git a/arch/ppc/cpu/mpc8220/fec.c b/arch/powerpc/cpu/mpc8220/fec.c
index 992e0ffbc4..992e0ffbc4 100644
--- a/arch/ppc/cpu/mpc8220/fec.c
+++ b/arch/powerpc/cpu/mpc8220/fec.c
diff --git a/arch/ppc/cpu/mpc8220/fec.h b/arch/powerpc/cpu/mpc8220/fec.h
index a8927fcdbb..a8927fcdbb 100644
--- a/arch/ppc/cpu/mpc8220/fec.h
+++ b/arch/powerpc/cpu/mpc8220/fec.h
diff --git a/arch/ppc/cpu/mpc8220/fec_dma_tasks.S b/arch/powerpc/cpu/mpc8220/fec_dma_tasks.S
index 3f8a03bf15..3f8a03bf15 100644
--- a/arch/ppc/cpu/mpc8220/fec_dma_tasks.S
+++ b/arch/powerpc/cpu/mpc8220/fec_dma_tasks.S
diff --git a/arch/ppc/cpu/mpc8220/i2c.c b/arch/powerpc/cpu/mpc8220/i2c.c
index 76ecdf11e2..76ecdf11e2 100644
--- a/arch/ppc/cpu/mpc8220/i2c.c
+++ b/arch/powerpc/cpu/mpc8220/i2c.c
diff --git a/arch/ppc/cpu/mpc8220/i2cCore.c b/arch/powerpc/cpu/mpc8220/i2cCore.c
index b89ad034f4..b89ad034f4 100644
--- a/arch/ppc/cpu/mpc8220/i2cCore.c
+++ b/arch/powerpc/cpu/mpc8220/i2cCore.c
diff --git a/arch/ppc/cpu/mpc8220/i2cCore.h b/arch/powerpc/cpu/mpc8220/i2cCore.h
index 72783fd48b..72783fd48b 100644
--- a/arch/ppc/cpu/mpc8220/i2cCore.h
+++ b/arch/powerpc/cpu/mpc8220/i2cCore.h
diff --git a/arch/ppc/cpu/mpc8220/interrupts.c b/arch/powerpc/cpu/mpc8220/interrupts.c
index 78e99179c9..78e99179c9 100644
--- a/arch/ppc/cpu/mpc8220/interrupts.c
+++ b/arch/powerpc/cpu/mpc8220/interrupts.c
diff --git a/arch/ppc/cpu/mpc8220/io.S b/arch/powerpc/cpu/mpc8220/io.S
index 5ecdf550a1..5ecdf550a1 100644
--- a/arch/ppc/cpu/mpc8220/io.S
+++ b/arch/powerpc/cpu/mpc8220/io.S
diff --git a/arch/ppc/cpu/mpc8220/loadtask.c b/arch/powerpc/cpu/mpc8220/loadtask.c
index 6d8b627e8c..6d8b627e8c 100644
--- a/arch/ppc/cpu/mpc8220/loadtask.c
+++ b/arch/powerpc/cpu/mpc8220/loadtask.c
diff --git a/arch/ppc/cpu/mpc8220/pci.c b/arch/powerpc/cpu/mpc8220/pci.c
index 7ef43b72cd..7ef43b72cd 100644
--- a/arch/ppc/cpu/mpc8220/pci.c
+++ b/arch/powerpc/cpu/mpc8220/pci.c
diff --git a/arch/ppc/cpu/mpc8220/speed.c b/arch/powerpc/cpu/mpc8220/speed.c
index 62ac845b7a..62ac845b7a 100644
--- a/arch/ppc/cpu/mpc8220/speed.c
+++ b/arch/powerpc/cpu/mpc8220/speed.c
diff --git a/arch/ppc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S
index e28999d322..3d79d8ec0d 100644
--- a/arch/ppc/cpu/mpc8220/start.S
+++ b/arch/powerpc/cpu/mpc8220/start.S
@@ -419,7 +419,7 @@ init_8220_core:
 	/*								*/
 	/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000	*/
 	/* incrementing by 0x1000 each time. The code below is sort of	*/
-	/* based on code in "flush_tlbs" from arch/ppc/kernel/head.S	*/
+	/* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S	*/
 	/*								*/
 	/*--------------------------------------------------------------*/
 
diff --git a/arch/ppc/cpu/mpc8220/traps.c b/arch/powerpc/cpu/mpc8220/traps.c
index 456578001b..13894c9050 100644
--- a/arch/ppc/cpu/mpc8220/traps.c
+++ b/arch/powerpc/cpu/mpc8220/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/mpc8220/u-boot.lds b/arch/powerpc/cpu/mpc8220/u-boot.lds
index 8c5d3071f9..31a7a0e4ef 100644
--- a/arch/ppc/cpu/mpc8220/u-boot.lds
+++ b/arch/powerpc/cpu/mpc8220/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc8220/start.o	(.text)
+    arch/powerpc/cpu/mpc8220/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc8220/uart.c b/arch/powerpc/cpu/mpc8220/uart.c
index 0c4b536b48..0c4b536b48 100644
--- a/arch/ppc/cpu/mpc8220/uart.c
+++ b/arch/powerpc/cpu/mpc8220/uart.c
diff --git a/arch/ppc/cpu/mpc824x/.gitignore b/arch/powerpc/cpu/mpc824x/.gitignore
index 2d79931e96..2d79931e96 100644
--- a/arch/ppc/cpu/mpc824x/.gitignore
+++ b/arch/powerpc/cpu/mpc824x/.gitignore
diff --git a/arch/ppc/cpu/mpc824x/Makefile b/arch/powerpc/cpu/mpc824x/Makefile
index a57ad12c41..a57ad12c41 100644
--- a/arch/ppc/cpu/mpc824x/Makefile
+++ b/arch/powerpc/cpu/mpc824x/Makefile
diff --git a/arch/ppc/cpu/mpc824x/config.mk b/arch/powerpc/cpu/mpc824x/config.mk
index 31ecd20d9f..27c287351b 100644
--- a/arch/ppc/cpu/mpc824x/config.mk
+++ b/arch/powerpc/cpu/mpc824x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
 PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc824x/u-boot.lds
diff --git a/arch/ppc/cpu/mpc824x/cpu.c b/arch/powerpc/cpu/mpc824x/cpu.c
index 08f6a947f4..08f6a947f4 100644
--- a/arch/ppc/cpu/mpc824x/cpu.c
+++ b/arch/powerpc/cpu/mpc824x/cpu.c
diff --git a/arch/ppc/cpu/mpc824x/cpu_init.c b/arch/powerpc/cpu/mpc824x/cpu_init.c
index 395f7767d1..395f7767d1 100644
--- a/arch/ppc/cpu/mpc824x/cpu_init.c
+++ b/arch/powerpc/cpu/mpc824x/cpu_init.c
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic.h b/arch/powerpc/cpu/mpc824x/drivers/epic.h
index 2803f631cf..2803f631cf 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic.h
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/README b/arch/powerpc/cpu/mpc824x/drivers/epic/README
index 57989969b9..57989969b9 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/README
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/README
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epic.h b/arch/powerpc/cpu/mpc824x/drivers/epic/epic.h
index 58f81c5dfd..58f81c5dfd 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epic.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epic.h
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c b/arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c
index ecbb42d0d6..ecbb42d0d6 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S b/arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S
index 52d19aae8e..52d19aae8e 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S b/arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S
index 4877050ba4..4877050ba4 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S
diff --git a/arch/ppc/cpu/mpc824x/drivers/errors.h b/arch/powerpc/cpu/mpc824x/drivers/errors.h
index 20794a2e89..20794a2e89 100644
--- a/arch/ppc/cpu/mpc824x/drivers/errors.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/errors.h
diff --git a/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c b/arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c
index 637ae4c1b1..637ae4c1b1 100644
--- a/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c
+++ b/arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c
diff --git a/arch/ppc/cpu/mpc824x/drivers/i2c_export.h b/arch/powerpc/cpu/mpc824x/drivers/i2c_export.h
index 6264d189bb..6264d189bb 100644
--- a/arch/ppc/cpu/mpc824x/drivers/i2c_export.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/i2c_export.h
diff --git a/arch/ppc/cpu/mpc824x/interrupts.c b/arch/powerpc/cpu/mpc824x/interrupts.c
index 139c52cd3c..139c52cd3c 100644
--- a/arch/ppc/cpu/mpc824x/interrupts.c
+++ b/arch/powerpc/cpu/mpc824x/interrupts.c
diff --git a/arch/ppc/cpu/mpc824x/pci.c b/arch/powerpc/cpu/mpc824x/pci.c
index cf9cf41ae5..72aaec7b51 100644
--- a/arch/ppc/cpu/mpc824x/pci.c
+++ b/arch/powerpc/cpu/mpc824x/pci.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/kernel/mpc10x_common.c
+ * arch/powerpc/kernel/mpc10x_common.c
  *
  * Common routines for the Motorola SPS MPC106, MPC107 and MPC8240 Host bridge,
  * Mem ctlr, EPIC, etc.
diff --git a/arch/ppc/cpu/mpc824x/speed.c b/arch/powerpc/cpu/mpc824x/speed.c
index fdcb9723cb..fdcb9723cb 100644
--- a/arch/ppc/cpu/mpc824x/speed.c
+++ b/arch/powerpc/cpu/mpc824x/speed.c
diff --git a/arch/ppc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S
index f3f595af25..f3f595af25 100644
--- a/arch/ppc/cpu/mpc824x/start.S
+++ b/arch/powerpc/cpu/mpc824x/start.S
diff --git a/arch/ppc/cpu/mpc824x/traps.c b/arch/powerpc/cpu/mpc824x/traps.c
index 0a7243020b..163b983340 100644
--- a/arch/ppc/cpu/mpc824x/traps.c
+++ b/arch/powerpc/cpu/mpc824x/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/mpc824x/u-boot.lds b/arch/powerpc/cpu/mpc824x/u-boot.lds
index 8a6d5084ec..d1fcd7c47d 100644
--- a/arch/ppc/cpu/mpc824x/u-boot.lds
+++ b/arch/powerpc/cpu/mpc824x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc824x/start.o		(.text)
+    arch/powerpc/cpu/mpc824x/start.o		(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc8260/Makefile b/arch/powerpc/cpu/mpc8260/Makefile
index 9f0c2dd50c..9f0c2dd50c 100644
--- a/arch/ppc/cpu/mpc8260/Makefile
+++ b/arch/powerpc/cpu/mpc8260/Makefile
diff --git a/arch/ppc/cpu/mpc8260/bedbug_603e.c b/arch/powerpc/cpu/mpc8260/bedbug_603e.c
index c969ff65e6..c969ff65e6 100644
--- a/arch/ppc/cpu/mpc8260/bedbug_603e.c
+++ b/arch/powerpc/cpu/mpc8260/bedbug_603e.c
diff --git a/arch/ppc/cpu/mpc8260/commproc.c b/arch/powerpc/cpu/mpc8260/commproc.c
index 94f6bc224f..111a67c98c 100644
--- a/arch/ppc/cpu/mpc8260/commproc.c
+++ b/arch/powerpc/cpu/mpc8260/commproc.c
@@ -1,5 +1,5 @@
 /*
- * This file is based on "arch/ppc/8260_io/commproc.c" - here is it's
+ * This file is based on "arch/powerpc/8260_io/commproc.c" - here is it's
  * copyright notice:
  *
  * General Purpose functions for the global management of the
diff --git a/arch/ppc/cpu/mpc8260/config.mk b/arch/powerpc/cpu/mpc8260/config.mk
index 51bb9faf25..a9bb6887a0 100644
--- a/arch/ppc/cpu/mpc8260/config.mk
+++ b/arch/powerpc/cpu/mpc8260/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8260/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc8260/u-boot.lds
diff --git a/arch/ppc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c
index aedbf297ab..aedbf297ab 100644
--- a/arch/ppc/cpu/mpc8260/cpu.c
+++ b/arch/powerpc/cpu/mpc8260/cpu.c
diff --git a/arch/ppc/cpu/mpc8260/cpu_init.c b/arch/powerpc/cpu/mpc8260/cpu_init.c
index 1d52773445..1d52773445 100644
--- a/arch/ppc/cpu/mpc8260/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8260/cpu_init.c
diff --git a/arch/ppc/cpu/mpc8260/ether_fcc.c b/arch/powerpc/cpu/mpc8260/ether_fcc.c
index 5ac02a09c0..5ac02a09c0 100644
--- a/arch/ppc/cpu/mpc8260/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_fcc.c
diff --git a/arch/ppc/cpu/mpc8260/ether_scc.c b/arch/powerpc/cpu/mpc8260/ether_scc.c
index 432111df4c..432111df4c 100644
--- a/arch/ppc/cpu/mpc8260/ether_scc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_scc.c
diff --git a/arch/ppc/cpu/mpc8260/i2c.c b/arch/powerpc/cpu/mpc8260/i2c.c
index d2bdcc2d82..d2bdcc2d82 100644
--- a/arch/ppc/cpu/mpc8260/i2c.c
+++ b/arch/powerpc/cpu/mpc8260/i2c.c
diff --git a/arch/ppc/cpu/mpc8260/interrupts.c b/arch/powerpc/cpu/mpc8260/interrupts.c
index a7700c4b65..2606c60d45 100644
--- a/arch/ppc/cpu/mpc8260/interrupts.c
+++ b/arch/powerpc/cpu/mpc8260/interrupts.c
@@ -44,7 +44,7 @@ static struct irq_action irq_handlers[NR_IRQS];
 static ulong ppc_cached_irq_mask[NR_MASK_WORDS];
 
 /****************************************************************************/
-/* this section was ripped out of arch/ppc/kernel/ppc8260_pic.c in the	    */
+/* this section was ripped out of arch/powerpc/kernel/ppc8260_pic.c in the	    */
 /* Linux/PPC 2.4.x source. There was no copyright notice in that file.	    */
 
 /* The 8260 internal interrupt controller.  It is usually
@@ -137,7 +137,7 @@ static int m8260_get_irq (struct pt_regs *regs)
 	return irq;
 }
 
-/* end of code ripped out of arch/ppc/kernel/ppc8260_pic.c		    */
+/* end of code ripped out of arch/powerpc/kernel/ppc8260_pic.c		    */
 /****************************************************************************/
 
 int interrupt_init_cpu (unsigned *decrementer_count)
diff --git a/arch/ppc/cpu/mpc8260/kgdb.S b/arch/powerpc/cpu/mpc8260/kgdb.S
index c5936c7345..c5936c7345 100644
--- a/arch/ppc/cpu/mpc8260/kgdb.S
+++ b/arch/powerpc/cpu/mpc8260/kgdb.S
diff --git a/arch/ppc/cpu/mpc8260/pci.c b/arch/powerpc/cpu/mpc8260/pci.c
index 6a14ba4adc..6a14ba4adc 100644
--- a/arch/ppc/cpu/mpc8260/pci.c
+++ b/arch/powerpc/cpu/mpc8260/pci.c
diff --git a/arch/ppc/cpu/mpc8260/serial_scc.c b/arch/powerpc/cpu/mpc8260/serial_scc.c
index 4ab6a28640..4ab6a28640 100644
--- a/arch/ppc/cpu/mpc8260/serial_scc.c
+++ b/arch/powerpc/cpu/mpc8260/serial_scc.c
diff --git a/arch/ppc/cpu/mpc8260/serial_smc.c b/arch/powerpc/cpu/mpc8260/serial_smc.c
index fbb3fb0420..7b6eaba09a 100644
--- a/arch/ppc/cpu/mpc8260/serial_smc.c
+++ b/arch/powerpc/cpu/mpc8260/serial_smc.c
@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  *
  * Hacked for MPC8260 by Murray.Jensen@cmst.csiro.au, 19-Oct-00, with
- * changes based on the file arch/ppc/mbxboot/m8260_tty.c from the
+ * changes based on the file arch/powerpc/mbxboot/m8260_tty.c from the
  * Linux/PPC sources (m8260_tty.c had no copyright info in it).
  */
 
diff --git a/arch/ppc/cpu/mpc8260/speed.c b/arch/powerpc/cpu/mpc8260/speed.c
index 0e1c2b0659..0e1c2b0659 100644
--- a/arch/ppc/cpu/mpc8260/speed.c
+++ b/arch/powerpc/cpu/mpc8260/speed.c
diff --git a/arch/ppc/cpu/mpc8260/speed.h b/arch/powerpc/cpu/mpc8260/speed.h
index 3f32a143cc..3f32a143cc 100644
--- a/arch/ppc/cpu/mpc8260/speed.h
+++ b/arch/powerpc/cpu/mpc8260/speed.h
diff --git a/arch/ppc/cpu/mpc8260/spi.c b/arch/powerpc/cpu/mpc8260/spi.c
index f5d2ac35a6..f5d2ac35a6 100644
--- a/arch/ppc/cpu/mpc8260/spi.c
+++ b/arch/powerpc/cpu/mpc8260/spi.c
diff --git a/arch/ppc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S
index 1fc70bc5e4..a43504276b 100644
--- a/arch/ppc/cpu/mpc8260/start.S
+++ b/arch/powerpc/cpu/mpc8260/start.S
@@ -576,7 +576,7 @@ init_8260_core:
 	/*								*/
 	/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000	*/
 	/* incrementing by 0x1000 each time. The code below is sort of	*/
-	/* based on code in "flush_tlbs" from arch/ppc/kernel/head.S	*/
+	/* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S	*/
 	/*								*/
 	/*--------------------------------------------------------------*/
 
diff --git a/arch/ppc/cpu/mpc8260/traps.c b/arch/powerpc/cpu/mpc8260/traps.c
index d216f71f94..c116cdf69d 100644
--- a/arch/ppc/cpu/mpc8260/traps.c
+++ b/arch/powerpc/cpu/mpc8260/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/mpc8260/u-boot.lds b/arch/powerpc/cpu/mpc8260/u-boot.lds
index 988784416f..b8681e706d 100644
--- a/arch/ppc/cpu/mpc8260/u-boot.lds
+++ b/arch/powerpc/cpu/mpc8260/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc8260/start.o		(.text)
+    arch/powerpc/cpu/mpc8260/start.o		(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc83xx/Makefile b/arch/powerpc/cpu/mpc83xx/Makefile
index 15e2c18b13..15e2c18b13 100644
--- a/arch/ppc/cpu/mpc83xx/Makefile
+++ b/arch/powerpc/cpu/mpc83xx/Makefile
diff --git a/arch/ppc/cpu/mpc83xx/config.mk b/arch/powerpc/cpu/mpc83xx/config.mk
index 8596f6a5e7..8a3a8c1b98 100644
--- a/arch/ppc/cpu/mpc83xx/config.mk
+++ b/arch/powerpc/cpu/mpc83xx/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \
 			-ffixed-r2 -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc83xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc83xx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 51180d6daa..51180d6daa 100644
--- a/arch/ppc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
diff --git a/arch/ppc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 75b45222bd..75b45222bd 100644
--- a/arch/ppc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index f3942b411f..f3942b411f 100644
--- a/arch/ppc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
diff --git a/arch/ppc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index daf73a6e5a..daf73a6e5a 100644
--- a/arch/ppc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
diff --git a/arch/ppc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index faffbaf838..faffbaf838 100644
--- a/arch/ppc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc83xx/nand_init.c b/arch/powerpc/cpu/mpc83xx/nand_init.c
index 38e141a828..38e141a828 100644
--- a/arch/ppc/cpu/mpc83xx/nand_init.c
+++ b/arch/powerpc/cpu/mpc83xx/nand_init.c
diff --git a/arch/ppc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index a42b230ff3..a42b230ff3 100644
--- a/arch/ppc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
diff --git a/arch/ppc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 77f8906b9f..77f8906b9f 100644
--- a/arch/ppc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
diff --git a/arch/ppc/cpu/mpc83xx/qe_io.c b/arch/powerpc/cpu/mpc83xx/qe_io.c
index db94f00098..db94f00098 100644
--- a/arch/ppc/cpu/mpc83xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc83xx/qe_io.c
diff --git a/arch/ppc/cpu/mpc83xx/serdes.c b/arch/powerpc/cpu/mpc83xx/serdes.c
index 64033fe4c3..64033fe4c3 100644
--- a/arch/ppc/cpu/mpc83xx/serdes.c
+++ b/arch/powerpc/cpu/mpc83xx/serdes.c
diff --git a/arch/ppc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index 44aaa9abc2..44aaa9abc2 100644
--- a/arch/ppc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
diff --git a/arch/ppc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index bde7e920a2..bde7e920a2 100644
--- a/arch/ppc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
diff --git a/arch/ppc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S
index 68bb6209c3..a7c80792de 100644
--- a/arch/ppc/cpu/mpc83xx/start.S
+++ b/arch/powerpc/cpu/mpc83xx/start.S
@@ -720,7 +720,7 @@ setup_bats:
 	 *
 	 * bits 15-19 correspond to addresses 0x00000000 to 0x0001F000
 	 * incrementing by 0x1000 each time. The code below is sort of
-	 * based on code in "flush_tlbs" from arch/ppc/kernel/head.S
+	 * based on code in "flush_tlbs" from arch/powerpc/kernel/head.S
 	 *
 	 */
 	lis	r3, 0
diff --git a/arch/ppc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index 9d71b8b730..9d71b8b730 100644
--- a/arch/ppc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
diff --git a/arch/ppc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds
index 157cef676e..0b74a13fb1 100644
--- a/arch/ppc/cpu/mpc83xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc83xx/start.o	(.text)
+    arch/powerpc/cpu/mpc83xx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index f064fee26b..f064fee26b 100644
--- a/arch/ppc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
diff --git a/arch/ppc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 594aace4b1..f0fd1cbc38 100644
--- a/arch/ppc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -2,7 +2,7 @@
  * Adapted for Motorola MPC8560 chips
  * Xianghua Xiao <x.xiao@motorola.com>
  *
- * This file is based on "arch/ppc/8260_io/commproc.c" - here is it's
+ * This file is based on "arch/powerpc/8260_io/commproc.c" - here is it's
  * copyright notice:
  *
  * General Purpose functions for the global management of the
diff --git a/arch/ppc/cpu/mpc85xx/config.mk b/arch/powerpc/cpu/mpc85xx/config.mk
index ffb813dc39..f07d9209a7 100644
--- a/arch/ppc/cpu/mpc85xx/config.mk
+++ b/arch/powerpc/cpu/mpc85xx/config.mk
@@ -32,4 +32,4 @@ PLATFORM_CPPFLAGS +=$(call cc-option,-mspe=yes)
 PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe)
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc85xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc85xx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 0cc6e0323f..0cc6e0323f 100644
--- a/arch/ppc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
diff --git a/arch/ppc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index e0126d331a..e0126d331a 100644
--- a/arch/ppc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index 32aa94b612..32aa94b612 100644
--- a/arch/ppc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
diff --git a/arch/ppc/cpu/mpc85xx/cpu_init_nand.c b/arch/powerpc/cpu/mpc85xx/cpu_init_nand.c
index 184cca4c54..184cca4c54 100644
--- a/arch/ppc/cpu/mpc85xx/cpu_init_nand.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_nand.c
diff --git a/arch/ppc/cpu/mpc85xx/ddr-gen1.c b/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
index 54437dd0cb..54437dd0cb 100644
--- a/arch/ppc/cpu/mpc85xx/ddr-gen1.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
diff --git a/arch/ppc/cpu/mpc85xx/ddr-gen2.c b/arch/powerpc/cpu/mpc85xx/ddr-gen2.c
index 655f99c028..655f99c028 100644
--- a/arch/ppc/cpu/mpc85xx/ddr-gen2.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen2.c
diff --git a/arch/ppc/cpu/mpc85xx/ddr-gen3.c b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
index 0691ca455a..0691ca455a 100644
--- a/arch/ppc/cpu/mpc85xx/ddr-gen3.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
diff --git a/arch/ppc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 5f1414d758..5f1414d758 100644
--- a/arch/ppc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
diff --git a/arch/ppc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 1d11ab470f..1d11ab470f 100644
--- a/arch/ppc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
diff --git a/arch/ppc/cpu/mpc85xx/fixed_ivor.S b/arch/powerpc/cpu/mpc85xx/fixed_ivor.S
index 320cae3296..320cae3296 100644
--- a/arch/ppc/cpu/mpc85xx/fixed_ivor.S
+++ b/arch/powerpc/cpu/mpc85xx/fixed_ivor.S
diff --git a/arch/ppc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index 409367d158..409367d158 100644
--- a/arch/ppc/cpu/mpc85xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc85xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 826bf32d4d..826bf32d4d 100644
--- a/arch/ppc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
diff --git a/arch/ppc/cpu/mpc85xx/mp.h b/arch/powerpc/cpu/mpc85xx/mp.h
index 3422cc1070..3422cc1070 100644
--- a/arch/ppc/cpu/mpc85xx/mp.h
+++ b/arch/powerpc/cpu/mpc85xx/mp.h
diff --git a/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index cb6a6f00c9..cb6a6f00c9 100644
--- a/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
diff --git a/arch/ppc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 75d2716ef4..75d2716ef4 100644
--- a/arch/ppc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
diff --git a/arch/ppc/cpu/mpc85xx/qe_io.c b/arch/powerpc/cpu/mpc85xx/qe_io.c
index 72a29b7b5a..72a29b7b5a 100644
--- a/arch/ppc/cpu/mpc85xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc85xx/qe_io.c
diff --git a/arch/ppc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S
index 0b5b9da032..0b5b9da032 100644
--- a/arch/ppc/cpu/mpc85xx/release.S
+++ b/arch/powerpc/cpu/mpc85xx/release.S
diff --git a/arch/ppc/cpu/mpc85xx/resetvec.S b/arch/powerpc/cpu/mpc85xx/resetvec.S
index 29555d4a00..29555d4a00 100644
--- a/arch/ppc/cpu/mpc85xx/resetvec.S
+++ b/arch/powerpc/cpu/mpc85xx/resetvec.S
diff --git a/arch/ppc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c
index 2dab2124fc..2dab2124fc 100644
--- a/arch/ppc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
diff --git a/arch/ppc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 268edbc5b7..268edbc5b7 100644
--- a/arch/ppc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
diff --git a/arch/ppc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index b3cb56a5b0..b3cb56a5b0 100644
--- a/arch/ppc/cpu/mpc85xx/start.S
+++ b/arch/powerpc/cpu/mpc85xx/start.S
diff --git a/arch/ppc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index b3037aceaf..b3037aceaf 100644
--- a/arch/ppc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
diff --git a/arch/ppc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 10108d86e3..7e96664333 100644
--- a/arch/ppc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright 2007 Freescale Semiconductor.
  * Copyright (C) 2003 Motorola
diff --git a/arch/ppc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
index b9240f22a7..5fd3e6c8ee 100644
--- a/arch/ppc/cpu/mpc85xx/u-boot-nand.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
@@ -117,7 +117,7 @@ SECTIONS
 
   .bootpg ADDR(.text) - 0x1000 :
   {
-    arch/ppc/cpu/mpc85xx/start.o	(.bootpg)
+    arch/powerpc/cpu/mpc85xx/start.o	(.bootpg)
   } :text = 0xffff
 
   . = ADDR(.text) + 0x80000;
diff --git a/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
index fef3e42e09..7d9cee98e5 100644
--- a/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
@@ -29,7 +29,7 @@ SECTIONS
 	. = 0xfff00000;
 	.text : {
 		*(.text)
-  	}
+	}
 	_etext = .;
 
 	.reloc : {
diff --git a/arch/ppc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 9698bf405a..c88b1f35b9 100644
--- a/arch/ppc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -121,7 +121,7 @@ SECTIONS
 
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
-    arch/ppc/cpu/mpc85xx/start.o	(.bootpg)
+    arch/powerpc/cpu/mpc85xx/start.o	(.bootpg)
   } :text = 0xffff
 
   .resetvec RESET_VECTOR_ADDRESS :
diff --git a/arch/ppc/cpu/mpc86xx/Makefile b/arch/powerpc/cpu/mpc86xx/Makefile
index daca79ad4f..daca79ad4f 100644
--- a/arch/ppc/cpu/mpc86xx/Makefile
+++ b/arch/powerpc/cpu/mpc86xx/Makefile
diff --git a/arch/ppc/cpu/mpc86xx/cache.S b/arch/powerpc/cpu/mpc86xx/cache.S
index 0bb058b043..0bb058b043 100644
--- a/arch/ppc/cpu/mpc86xx/cache.S
+++ b/arch/powerpc/cpu/mpc86xx/cache.S
diff --git a/arch/ppc/cpu/mpc86xx/config.mk b/arch/powerpc/cpu/mpc86xx/config.mk
index ca2f8376ed..ca2f8376ed 100644
--- a/arch/ppc/cpu/mpc86xx/config.mk
+++ b/arch/powerpc/cpu/mpc86xx/config.mk
diff --git a/arch/ppc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 188757587f..188757587f 100644
--- a/arch/ppc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
diff --git a/arch/ppc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index b4f047d85d..b4f047d85d 100644
--- a/arch/ppc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc86xx/ddr-8641.c b/arch/powerpc/cpu/mpc86xx/ddr-8641.c
index b8f2c9387f..b8f2c9387f 100644
--- a/arch/ppc/cpu/mpc86xx/ddr-8641.c
+++ b/arch/powerpc/cpu/mpc86xx/ddr-8641.c
diff --git a/arch/ppc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index 51f3f4c220..51f3f4c220 100644
--- a/arch/ppc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
diff --git a/arch/ppc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index c78fc72254..c78fc72254 100644
--- a/arch/ppc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index b4a0faacde..b4a0faacde 100644
--- a/arch/ppc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
diff --git a/arch/ppc/cpu/mpc86xx/release.S b/arch/powerpc/cpu/mpc86xx/release.S
index 67a6f2bdb5..67a6f2bdb5 100644
--- a/arch/ppc/cpu/mpc86xx/release.S
+++ b/arch/powerpc/cpu/mpc86xx/release.S
diff --git a/arch/ppc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 64a3479d7e..64a3479d7e 100644
--- a/arch/ppc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
diff --git a/arch/ppc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S
index ed1e4ca668..ed1e4ca668 100644
--- a/arch/ppc/cpu/mpc86xx/start.S
+++ b/arch/powerpc/cpu/mpc86xx/start.S
diff --git a/arch/ppc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index 406403e512..406403e512 100644
--- a/arch/ppc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
diff --git a/arch/ppc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile
index 5f70459690..5f70459690 100644
--- a/arch/ppc/cpu/mpc8xx/Makefile
+++ b/arch/powerpc/cpu/mpc8xx/Makefile
diff --git a/arch/ppc/cpu/mpc8xx/bedbug_860.c b/arch/powerpc/cpu/mpc8xx/bedbug_860.c
index 0308bbbf7a..0308bbbf7a 100644
--- a/arch/ppc/cpu/mpc8xx/bedbug_860.c
+++ b/arch/powerpc/cpu/mpc8xx/bedbug_860.c
diff --git a/arch/ppc/cpu/mpc8xx/commproc.c b/arch/powerpc/cpu/mpc8xx/commproc.c
index a87a0dce88..a87a0dce88 100644
--- a/arch/ppc/cpu/mpc8xx/commproc.c
+++ b/arch/powerpc/cpu/mpc8xx/commproc.c
diff --git a/arch/ppc/cpu/mpc8xx/config.mk b/arch/powerpc/cpu/mpc8xx/config.mk
index 5540d65350..5540d65350 100644
--- a/arch/ppc/cpu/mpc8xx/config.mk
+++ b/arch/powerpc/cpu/mpc8xx/config.mk
diff --git a/arch/ppc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 2eb848bd0e..2eb848bd0e 100644
--- a/arch/ppc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
diff --git a/arch/ppc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index eb0091bdb3..eb0091bdb3 100644
--- a/arch/ppc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
index 7130983ff2..7130983ff2 100644
--- a/arch/ppc/cpu/mpc8xx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xx/fdt.c
diff --git a/arch/ppc/cpu/mpc8xx/fec.c b/arch/powerpc/cpu/mpc8xx/fec.c
index 89c1ff939d..89c1ff939d 100644
--- a/arch/ppc/cpu/mpc8xx/fec.c
+++ b/arch/powerpc/cpu/mpc8xx/fec.c
diff --git a/arch/ppc/cpu/mpc8xx/fec.h b/arch/powerpc/cpu/mpc8xx/fec.h
index a49417c666..a49417c666 100644
--- a/arch/ppc/cpu/mpc8xx/fec.h
+++ b/arch/powerpc/cpu/mpc8xx/fec.h
diff --git a/arch/ppc/cpu/mpc8xx/i2c.c b/arch/powerpc/cpu/mpc8xx/i2c.c
index 338cababe8..338cababe8 100644
--- a/arch/ppc/cpu/mpc8xx/i2c.c
+++ b/arch/powerpc/cpu/mpc8xx/i2c.c
diff --git a/arch/ppc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index 5daa6b2752..5daa6b2752 100644
--- a/arch/ppc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc8xx/kgdb.S b/arch/powerpc/cpu/mpc8xx/kgdb.S
index 2cc8fe63c9..2cc8fe63c9 100644
--- a/arch/ppc/cpu/mpc8xx/kgdb.S
+++ b/arch/powerpc/cpu/mpc8xx/kgdb.S
diff --git a/arch/ppc/cpu/mpc8xx/lcd.c b/arch/powerpc/cpu/mpc8xx/lcd.c
index 4b88b21b3f..4b88b21b3f 100644
--- a/arch/ppc/cpu/mpc8xx/lcd.c
+++ b/arch/powerpc/cpu/mpc8xx/lcd.c
diff --git a/arch/ppc/cpu/mpc8xx/plprcr_write.S b/arch/powerpc/cpu/mpc8xx/plprcr_write.S
index e325671142..e325671142 100644
--- a/arch/ppc/cpu/mpc8xx/plprcr_write.S
+++ b/arch/powerpc/cpu/mpc8xx/plprcr_write.S
diff --git a/arch/ppc/cpu/mpc8xx/scc.c b/arch/powerpc/cpu/mpc8xx/scc.c
index effb967e32..effb967e32 100644
--- a/arch/ppc/cpu/mpc8xx/scc.c
+++ b/arch/powerpc/cpu/mpc8xx/scc.c
diff --git a/arch/ppc/cpu/mpc8xx/serial.c b/arch/powerpc/cpu/mpc8xx/serial.c
index 664db65a56..664db65a56 100644
--- a/arch/ppc/cpu/mpc8xx/serial.c
+++ b/arch/powerpc/cpu/mpc8xx/serial.c
diff --git a/arch/ppc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index f309f29c04..f309f29c04 100644
--- a/arch/ppc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
diff --git a/arch/ppc/cpu/mpc8xx/spi.c b/arch/powerpc/cpu/mpc8xx/spi.c
index b2ac23e5ea..b2ac23e5ea 100644
--- a/arch/ppc/cpu/mpc8xx/spi.c
+++ b/arch/powerpc/cpu/mpc8xx/spi.c
diff --git a/arch/ppc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S
index 7cf602fd4b..7cf602fd4b 100644
--- a/arch/ppc/cpu/mpc8xx/start.S
+++ b/arch/powerpc/cpu/mpc8xx/start.S
diff --git a/arch/ppc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 6efe8e0ea7..343dced31f 100644
--- a/arch/ppc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/mpc8xx/upatch.c b/arch/powerpc/cpu/mpc8xx/upatch.c
index a8cb735ab7..a8cb735ab7 100644
--- a/arch/ppc/cpu/mpc8xx/upatch.c
+++ b/arch/powerpc/cpu/mpc8xx/upatch.c
diff --git a/arch/ppc/cpu/mpc8xx/video.c b/arch/powerpc/cpu/mpc8xx/video.c
index c79c499b6f..c79c499b6f 100644
--- a/arch/ppc/cpu/mpc8xx/video.c
+++ b/arch/powerpc/cpu/mpc8xx/video.c
diff --git a/arch/ppc/cpu/mpc8xx/wlkbd.c b/arch/powerpc/cpu/mpc8xx/wlkbd.c
index 13009e2641..13009e2641 100644
--- a/arch/ppc/cpu/mpc8xx/wlkbd.c
+++ b/arch/powerpc/cpu/mpc8xx/wlkbd.c
diff --git a/arch/ppc/cpu/mpc8xxx/Makefile b/arch/powerpc/cpu/mpc8xxx/Makefile
index 481f9e541d..481f9e541d 100644
--- a/arch/ppc/cpu/mpc8xxx/Makefile
+++ b/arch/powerpc/cpu/mpc8xxx/Makefile
diff --git a/arch/ppc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index fef062b224..22f3423723 100644
--- a/arch/ppc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -1,8 +1,8 @@
 /*
  * Copyright 2009-2010 Freescale Semiconductor, Inc.
  *
- * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
- * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
+ * arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
  * cpu specific common code for 85xx/86xx processors.
  * See file CREDITS for list of people who contributed to this
  * project.
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/Makefile b/arch/powerpc/cpu/mpc8xxx/ddr/Makefile
index cb7f856554..cb7f856554 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/Makefile
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/Makefile
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h b/arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h
index 5aea517f25..5aea517f25 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c b/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c
index 03f9c4380d..03f9c4380d 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr.h b/arch/powerpc/cpu/mpc8xxx/ddr/ddr.h
index f1220750df..f1220750df 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr.h
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr.h
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
index 9184764418..9184764418 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
index d9d0fa70ee..d9d0fa70ee 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
index d4199baa82..d4199baa82 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
index e888e3ea56..e888e3ea56 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
index faa1af95ef..faa1af95ef 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/main.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/options.c b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
index 46731c8153..46731c8153 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/options.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/util.c b/arch/powerpc/cpu/mpc8xxx/ddr/util.c
index 1e2d921286..1e2d921286 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/util.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/util.c
diff --git a/arch/ppc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index e68d6f336b..ccefaf5716 100644
--- a/arch/ppc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -1,8 +1,8 @@
 /*
  * Copyright 2009 Freescale Semiconductor, Inc.
  *
- * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
- * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
+ * arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
  * cpu specific common code for 85xx/86xx processors.
  * See file CREDITS for list of people who contributed to this
  * project.
diff --git a/arch/ppc/cpu/mpc8xxx/pci_cfg.c b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
index 9b7181d5b6..9b7181d5b6 100644
--- a/arch/ppc/cpu/mpc8xxx/pci_cfg.c
+++ b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
diff --git a/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c b/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
index 595d5687d6..f65cd886a5 100644
--- a/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
+++ b/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
+ * arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
  * This SPD SDRAM detection code supports IBM/AMCC PPC44x cpu with a
  * SDRAM controller. Those are all current 405 PPC's.
  *
diff --git a/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
index 9d1994f99e..005315be8c 100644
--- a/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
+ * arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
  * This SPD DDR detection code supports IBM/AMCC PPC44x cpu with a
  * DDR controller. Those are 440GP/GX/EP/GR.
  *
diff --git a/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
index ea6c2ac770..faddee98b7 100644
--- a/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
+ * arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *
diff --git a/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
index 72630716c9..aed0ed7569 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+ * arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *
diff --git a/arch/ppc/cpu/ppc4xx/4xx_pci.c b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
index eed4534e5f..eed4534e5f 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_pci.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
diff --git a/arch/ppc/cpu/ppc4xx/4xx_pcie.c b/arch/powerpc/cpu/ppc4xx/4xx_pcie.c
index 10b58b7118..10b58b7118 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_pcie.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_pcie.c
diff --git a/arch/ppc/cpu/ppc4xx/4xx_uart.c b/arch/powerpc/cpu/ppc4xx/4xx_uart.c
index 8de65425c9..8de65425c9 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_uart.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_uart.c
diff --git a/arch/ppc/cpu/ppc4xx/Makefile b/arch/powerpc/cpu/ppc4xx/Makefile
index 88d53fbb1a..88d53fbb1a 100644
--- a/arch/ppc/cpu/ppc4xx/Makefile
+++ b/arch/powerpc/cpu/ppc4xx/Makefile
diff --git a/arch/ppc/cpu/ppc4xx/bedbug_405.c b/arch/powerpc/cpu/ppc4xx/bedbug_405.c
index ef11cb65e4..ef11cb65e4 100644
--- a/arch/ppc/cpu/ppc4xx/bedbug_405.c
+++ b/arch/powerpc/cpu/ppc4xx/bedbug_405.c
diff --git a/arch/ppc/cpu/ppc4xx/cache.S b/arch/powerpc/cpu/ppc4xx/cache.S
index 269716fceb..269716fceb 100644
--- a/arch/ppc/cpu/ppc4xx/cache.S
+++ b/arch/powerpc/cpu/ppc4xx/cache.S
diff --git a/arch/ppc/cpu/ppc4xx/cmd_chip_config.c b/arch/powerpc/cpu/ppc4xx/cmd_chip_config.c
index ba57211dd0..ba57211dd0 100644
--- a/arch/ppc/cpu/ppc4xx/cmd_chip_config.c
+++ b/arch/powerpc/cpu/ppc4xx/cmd_chip_config.c
diff --git a/arch/ppc/cpu/ppc4xx/commproc.c b/arch/powerpc/cpu/ppc4xx/commproc.c
index a1696d37e6..a1696d37e6 100644
--- a/arch/ppc/cpu/ppc4xx/commproc.c
+++ b/arch/powerpc/cpu/ppc4xx/commproc.c
diff --git a/arch/ppc/cpu/ppc4xx/config.mk b/arch/powerpc/cpu/ppc4xx/config.mk
index ea4d707842..5bda710e26 100644
--- a/arch/ppc/cpu/ppc4xx/config.mk
+++ b/arch/powerpc/cpu/ppc4xx/config.mk
@@ -34,4 +34,4 @@ PLATFORM_CPPFLAGS += -Wa,-m405 -mcpu=405
 endif
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/ppc4xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/ppc4xx/u-boot.lds
diff --git a/arch/ppc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c
index e1a023b703..e1a023b703 100644
--- a/arch/ppc/cpu/ppc4xx/cpu.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu.c
diff --git a/arch/ppc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c
index 8a6e545c1a..8a6e545c1a 100644
--- a/arch/ppc/cpu/ppc4xx/cpu_init.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c
diff --git a/arch/ppc/cpu/ppc4xx/dcr.S b/arch/powerpc/cpu/ppc4xx/dcr.S
index 93465a3b51..93465a3b51 100644
--- a/arch/ppc/cpu/ppc4xx/dcr.S
+++ b/arch/powerpc/cpu/ppc4xx/dcr.S
diff --git a/arch/ppc/cpu/ppc4xx/denali_data_eye.c b/arch/powerpc/cpu/ppc4xx/denali_data_eye.c
index 15a9b4f3ec..03b8d3c614 100644
--- a/arch/ppc/cpu/ppc4xx/denali_data_eye.c
+++ b/arch/powerpc/cpu/ppc4xx/denali_data_eye.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/cpu/ppc4xx/denali_data_eye.c
+ * arch/powerpc/cpu/ppc4xx/denali_data_eye.c
  * Extracted from board/amcc/sequoia/sdram.c by Larry Johnson <lrj@acm.org>.
  *
  * (C) Copyright 2006
diff --git a/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
index 72f76cd2fa..080ea0af4c 100644
--- a/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
@@ -1,12 +1,12 @@
 /*
- * arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
+ * arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
  * This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core
  * DDR2 controller, specifically the 440EPx/GRx.
  *
  * (C) Copyright 2007-2008
  * Larry Johnson, lrj@acm.org.
  *
- * Based primarily on arch/ppc/cpu/ppc4xx/4xx_spd_ddr2.c, which is...
+ * Based primarily on arch/powerpc/cpu/ppc4xx/4xx_spd_ddr2.c, which is...
  *
  * (C) Copyright 2007
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
diff --git a/arch/ppc/cpu/ppc4xx/ecc.c b/arch/powerpc/cpu/ppc4xx/ecc.c
index f105605459..f105605459 100644
--- a/arch/ppc/cpu/ppc4xx/ecc.c
+++ b/arch/powerpc/cpu/ppc4xx/ecc.c
diff --git a/arch/ppc/cpu/ppc4xx/ecc.h b/arch/powerpc/cpu/ppc4xx/ecc.h
index b2588919eb..b2588919eb 100644
--- a/arch/ppc/cpu/ppc4xx/ecc.h
+++ b/arch/powerpc/cpu/ppc4xx/ecc.h
diff --git a/arch/ppc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c
index 15a184b5c6..15a184b5c6 100644
--- a/arch/ppc/cpu/ppc4xx/fdt.c
+++ b/arch/powerpc/cpu/ppc4xx/fdt.c
diff --git a/arch/ppc/cpu/ppc4xx/gpio.c b/arch/powerpc/cpu/ppc4xx/gpio.c
index c0d351a957..c0d351a957 100644
--- a/arch/ppc/cpu/ppc4xx/gpio.c
+++ b/arch/powerpc/cpu/ppc4xx/gpio.c
diff --git a/arch/ppc/cpu/ppc4xx/interrupts.c b/arch/powerpc/cpu/ppc4xx/interrupts.c
index 6db84210b8..6db84210b8 100644
--- a/arch/ppc/cpu/ppc4xx/interrupts.c
+++ b/arch/powerpc/cpu/ppc4xx/interrupts.c
diff --git a/arch/ppc/cpu/ppc4xx/iop480_uart.c b/arch/powerpc/cpu/ppc4xx/iop480_uart.c
index 0e3423f7ab..0e3423f7ab 100644
--- a/arch/ppc/cpu/ppc4xx/iop480_uart.c
+++ b/arch/powerpc/cpu/ppc4xx/iop480_uart.c
diff --git a/arch/ppc/cpu/ppc4xx/kgdb.S b/arch/powerpc/cpu/ppc4xx/kgdb.S
index 4227a4c15b..4227a4c15b 100644
--- a/arch/ppc/cpu/ppc4xx/kgdb.S
+++ b/arch/powerpc/cpu/ppc4xx/kgdb.S
diff --git a/arch/ppc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c
index 22ed5c25ea..22ed5c25ea 100644
--- a/arch/ppc/cpu/ppc4xx/miiphy.c
+++ b/arch/powerpc/cpu/ppc4xx/miiphy.c
diff --git a/arch/ppc/cpu/ppc4xx/reginfo.c b/arch/powerpc/cpu/ppc4xx/reginfo.c
index a9756672c1..a9756672c1 100644
--- a/arch/ppc/cpu/ppc4xx/reginfo.c
+++ b/arch/powerpc/cpu/ppc4xx/reginfo.c
diff --git a/arch/ppc/cpu/ppc4xx/resetvec.S b/arch/powerpc/cpu/ppc4xx/resetvec.S
index b3308bd6ae..b3308bd6ae 100644
--- a/arch/ppc/cpu/ppc4xx/resetvec.S
+++ b/arch/powerpc/cpu/ppc4xx/resetvec.S
diff --git a/arch/ppc/cpu/ppc4xx/sdram.c b/arch/powerpc/cpu/ppc4xx/sdram.c
index 30c6e0e38e..30c6e0e38e 100644
--- a/arch/ppc/cpu/ppc4xx/sdram.c
+++ b/arch/powerpc/cpu/ppc4xx/sdram.c
diff --git a/arch/ppc/cpu/ppc4xx/sdram.h b/arch/powerpc/cpu/ppc4xx/sdram.h
index bea3376534..bea3376534 100644
--- a/arch/ppc/cpu/ppc4xx/sdram.h
+++ b/arch/powerpc/cpu/ppc4xx/sdram.h
diff --git a/arch/ppc/cpu/ppc4xx/speed.c b/arch/powerpc/cpu/ppc4xx/speed.c
index 906face033..906face033 100644
--- a/arch/ppc/cpu/ppc4xx/speed.c
+++ b/arch/powerpc/cpu/ppc4xx/speed.c
diff --git a/arch/ppc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index c739deb9b4..c739deb9b4 100644
--- a/arch/ppc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
diff --git a/arch/ppc/cpu/ppc4xx/tlb.c b/arch/powerpc/cpu/ppc4xx/tlb.c
index 24a9a9cc28..24a9a9cc28 100644
--- a/arch/ppc/cpu/ppc4xx/tlb.c
+++ b/arch/powerpc/cpu/ppc4xx/tlb.c
diff --git a/arch/ppc/cpu/ppc4xx/traps.c b/arch/powerpc/cpu/ppc4xx/traps.c
index 42e422157c..1616772f0f 100644
--- a/arch/ppc/cpu/ppc4xx/traps.c
+++ b/arch/powerpc/cpu/ppc4xx/traps.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
diff --git a/arch/ppc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds
index 3704d8a695..eca1f9dd82 100644
--- a/arch/ppc/cpu/ppc4xx/u-boot.lds
+++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds
@@ -124,7 +124,7 @@ SECTIONS
 #ifdef CONFIG_440
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
-    arch/ppc/cpu/ppc4xx/start.o	(.bootpg)
+    arch/powerpc/cpu/ppc4xx/start.o	(.bootpg)
 
     /*
      * PPC440 board need a board specific object with the
diff --git a/arch/ppc/cpu/ppc4xx/uic.c b/arch/powerpc/cpu/ppc4xx/uic.c
index 8b1b259faf..8b1b259faf 100644
--- a/arch/ppc/cpu/ppc4xx/uic.c
+++ b/arch/powerpc/cpu/ppc4xx/uic.c
diff --git a/arch/ppc/cpu/ppc4xx/usb.c b/arch/powerpc/cpu/ppc4xx/usb.c
index 592efe70a7..592efe70a7 100644
--- a/arch/ppc/cpu/ppc4xx/usb.c
+++ b/arch/powerpc/cpu/ppc4xx/usb.c
diff --git a/arch/ppc/cpu/ppc4xx/usb_ohci.c b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
index a9edacd330..a9edacd330 100644
--- a/arch/ppc/cpu/ppc4xx/usb_ohci.c
+++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
diff --git a/arch/ppc/cpu/ppc4xx/usb_ohci.h b/arch/powerpc/cpu/ppc4xx/usb_ohci.h
index 2c3dc4f99c..2c3dc4f99c 100644
--- a/arch/ppc/cpu/ppc4xx/usb_ohci.h
+++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.h
diff --git a/arch/ppc/cpu/ppc4xx/usbdev.c b/arch/powerpc/cpu/ppc4xx/usbdev.c
index fe398afc02..fe398afc02 100644
--- a/arch/ppc/cpu/ppc4xx/usbdev.c
+++ b/arch/powerpc/cpu/ppc4xx/usbdev.c
diff --git a/arch/ppc/cpu/ppc4xx/usbdev.h b/arch/powerpc/cpu/ppc4xx/usbdev.h
index ef6a2da649..ef6a2da649 100644
--- a/arch/ppc/cpu/ppc4xx/usbdev.h
+++ b/arch/powerpc/cpu/ppc4xx/usbdev.h
diff --git a/arch/ppc/cpu/ppc4xx/xilinx_irq.c b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c
index 71087771cb..71087771cb 100644
--- a/arch/ppc/cpu/ppc4xx/xilinx_irq.c
+++ b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c
diff --git a/arch/ppc/include/asm/4xx_pci.h b/arch/powerpc/include/asm/4xx_pci.h
index f686e7cb07..f686e7cb07 100644
--- a/arch/ppc/include/asm/4xx_pci.h
+++ b/arch/powerpc/include/asm/4xx_pci.h
diff --git a/arch/ppc/include/asm/4xx_pcie.h b/arch/powerpc/include/asm/4xx_pcie.h
index a0e88de11d..a0e88de11d 100644
--- a/arch/ppc/include/asm/4xx_pcie.h
+++ b/arch/powerpc/include/asm/4xx_pcie.h
diff --git a/arch/ppc/include/asm/5xx_immap.h b/arch/powerpc/include/asm/5xx_immap.h
index 72cbab43e4..72cbab43e4 100644
--- a/arch/ppc/include/asm/5xx_immap.h
+++ b/arch/powerpc/include/asm/5xx_immap.h
diff --git a/arch/ppc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h
index 40679cb2b0..40679cb2b0 100644
--- a/arch/ppc/include/asm/8xx_immap.h
+++ b/arch/powerpc/include/asm/8xx_immap.h
diff --git a/arch/ppc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
index 23f22df1b7..23f22df1b7 100644
--- a/arch/ppc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
diff --git a/arch/ppc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index adaf091492..adaf091492 100644
--- a/arch/ppc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
diff --git a/arch/ppc/include/asm/byteorder.h b/arch/powerpc/include/asm/byteorder.h
index 3f5bcf63a1..3f5bcf63a1 100644
--- a/arch/ppc/include/asm/byteorder.h
+++ b/arch/powerpc/include/asm/byteorder.h
diff --git a/arch/ppc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
index 53e8d05f50..53e8d05f50 100644
--- a/arch/ppc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
diff --git a/arch/ppc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index fc3facb307..fc3facb307 100644
--- a/arch/ppc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
diff --git a/arch/ppc/include/asm/cpm_8260.h b/arch/powerpc/include/asm/cpm_8260.h
index 8302404abb..8302404abb 100644
--- a/arch/ppc/include/asm/cpm_8260.h
+++ b/arch/powerpc/include/asm/cpm_8260.h
diff --git a/arch/ppc/include/asm/cpm_85xx.h b/arch/powerpc/include/asm/cpm_85xx.h
index a74a3a115b..a74a3a115b 100644
--- a/arch/ppc/include/asm/cpm_85xx.h
+++ b/arch/powerpc/include/asm/cpm_85xx.h
diff --git a/arch/ppc/include/asm/e300.h b/arch/powerpc/include/asm/e300.h
index bfef4dfd62..bfef4dfd62 100644
--- a/arch/ppc/include/asm/e300.h
+++ b/arch/powerpc/include/asm/e300.h
diff --git a/arch/ppc/include/asm/errno.h b/arch/powerpc/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/arch/ppc/include/asm/errno.h
+++ b/arch/powerpc/include/asm/errno.h
diff --git a/arch/ppc/include/asm/fsl_ddr_dimm_params.h b/arch/powerpc/include/asm/fsl_ddr_dimm_params.h
index 55923e09b3..55923e09b3 100644
--- a/arch/ppc/include/asm/fsl_ddr_dimm_params.h
+++ b/arch/powerpc/include/asm/fsl_ddr_dimm_params.h
diff --git a/arch/ppc/include/asm/fsl_ddr_sdram.h b/arch/powerpc/include/asm/fsl_ddr_sdram.h
index 3216a50633..3216a50633 100644
--- a/arch/ppc/include/asm/fsl_ddr_sdram.h
+++ b/arch/powerpc/include/asm/fsl_ddr_sdram.h
diff --git a/arch/ppc/include/asm/fsl_dma.h b/arch/powerpc/include/asm/fsl_dma.h
index 11641912a6..11641912a6 100644
--- a/arch/ppc/include/asm/fsl_dma.h
+++ b/arch/powerpc/include/asm/fsl_dma.h
diff --git a/arch/ppc/include/asm/fsl_i2c.h b/arch/powerpc/include/asm/fsl_i2c.h
index 4f71341327..4f71341327 100644
--- a/arch/ppc/include/asm/fsl_i2c.h
+++ b/arch/powerpc/include/asm/fsl_i2c.h
diff --git a/arch/ppc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h
index 34c56a259a..34c56a259a 100644
--- a/arch/ppc/include/asm/fsl_law.h
+++ b/arch/powerpc/include/asm/fsl_law.h
diff --git a/arch/ppc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index 5723de643a..5723de643a 100644
--- a/arch/ppc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
diff --git a/arch/ppc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h
index db61e7e9cb..db61e7e9cb 100644
--- a/arch/ppc/include/asm/fsl_pci.h
+++ b/arch/powerpc/include/asm/fsl_pci.h
diff --git a/arch/ppc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h
index 6da4b6ff94..6da4b6ff94 100644
--- a/arch/ppc/include/asm/fsl_serdes.h
+++ b/arch/powerpc/include/asm/fsl_serdes.h
diff --git a/arch/ppc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index d3dd44e96d..d3dd44e96d 100644
--- a/arch/ppc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
diff --git a/arch/ppc/include/asm/gpio.h b/arch/powerpc/include/asm/gpio.h
index 23e29b195e..23e29b195e 100644
--- a/arch/ppc/include/asm/gpio.h
+++ b/arch/powerpc/include/asm/gpio.h
diff --git a/arch/ppc/include/asm/immap_512x.h b/arch/powerpc/include/asm/immap_512x.h
index 95350fd9b8..95350fd9b8 100644
--- a/arch/ppc/include/asm/immap_512x.h
+++ b/arch/powerpc/include/asm/immap_512x.h
diff --git a/arch/ppc/include/asm/immap_8220.h b/arch/powerpc/include/asm/immap_8220.h
index f9595f42d9..f9595f42d9 100644
--- a/arch/ppc/include/asm/immap_8220.h
+++ b/arch/powerpc/include/asm/immap_8220.h
diff --git a/arch/ppc/include/asm/immap_8260.h b/arch/powerpc/include/asm/immap_8260.h
index 4974ae56fc..4974ae56fc 100644
--- a/arch/ppc/include/asm/immap_8260.h
+++ b/arch/powerpc/include/asm/immap_8260.h
diff --git a/arch/ppc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index 6b42a73f3f..6b42a73f3f 100644
--- a/arch/ppc/include/asm/immap_83xx.h
+++ b/arch/powerpc/include/asm/immap_83xx.h
diff --git a/arch/ppc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 957ad76a79..957ad76a79 100644
--- a/arch/ppc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
diff --git a/arch/ppc/include/asm/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h
index fd7acdb767..fd7acdb767 100644
--- a/arch/ppc/include/asm/immap_86xx.h
+++ b/arch/powerpc/include/asm/immap_86xx.h
diff --git a/arch/ppc/include/asm/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h
index 531cfc891d..531cfc891d 100644
--- a/arch/ppc/include/asm/immap_qe.h
+++ b/arch/powerpc/include/asm/immap_qe.h
diff --git a/arch/ppc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index 792836b229..792836b229 100644
--- a/arch/ppc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
diff --git a/arch/ppc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 4ddad26e81..4ddad26e81 100644
--- a/arch/ppc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
diff --git a/arch/ppc/include/asm/iopin_8260.h b/arch/powerpc/include/asm/iopin_8260.h
index 619f3a8abe..619f3a8abe 100644
--- a/arch/ppc/include/asm/iopin_8260.h
+++ b/arch/powerpc/include/asm/iopin_8260.h
diff --git a/arch/ppc/include/asm/iopin_85xx.h b/arch/powerpc/include/asm/iopin_85xx.h
index 0f07ba355e..0f07ba355e 100644
--- a/arch/ppc/include/asm/iopin_85xx.h
+++ b/arch/powerpc/include/asm/iopin_85xx.h
diff --git a/arch/ppc/include/asm/iopin_8xx.h b/arch/powerpc/include/asm/iopin_8xx.h
index 3a2a682f66..3a2a682f66 100644
--- a/arch/ppc/include/asm/iopin_8xx.h
+++ b/arch/powerpc/include/asm/iopin_8xx.h
diff --git a/arch/ppc/include/asm/m8260_pci.h b/arch/powerpc/include/asm/m8260_pci.h
index 45f01de820..45f01de820 100644
--- a/arch/ppc/include/asm/m8260_pci.h
+++ b/arch/powerpc/include/asm/m8260_pci.h
diff --git a/arch/ppc/include/asm/mc146818rtc.h b/arch/powerpc/include/asm/mc146818rtc.h
index 5f806c4ec2..5f806c4ec2 100644
--- a/arch/ppc/include/asm/mc146818rtc.h
+++ b/arch/powerpc/include/asm/mc146818rtc.h
diff --git a/arch/ppc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index ce7f081005..ce7f081005 100644
--- a/arch/ppc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
diff --git a/arch/ppc/include/asm/mp.h b/arch/powerpc/include/asm/mp.h
index 5388c951c8..5388c951c8 100644
--- a/arch/ppc/include/asm/mp.h
+++ b/arch/powerpc/include/asm/mp.h
diff --git a/arch/ppc/include/asm/mpc512x.h b/arch/powerpc/include/asm/mpc512x.h
index 960e229294..960e229294 100644
--- a/arch/ppc/include/asm/mpc512x.h
+++ b/arch/powerpc/include/asm/mpc512x.h
diff --git a/arch/ppc/include/asm/mpc8349_pci.h b/arch/powerpc/include/asm/mpc8349_pci.h
index 7a1adba950..7a1adba950 100644
--- a/arch/ppc/include/asm/mpc8349_pci.h
+++ b/arch/powerpc/include/asm/mpc8349_pci.h
diff --git a/arch/ppc/include/asm/mpc8xxx_spi.h b/arch/powerpc/include/asm/mpc8xxx_spi.h
index 41737d3c69..41737d3c69 100644
--- a/arch/ppc/include/asm/mpc8xxx_spi.h
+++ b/arch/powerpc/include/asm/mpc8xxx_spi.h
diff --git a/arch/ppc/include/asm/pci_io.h b/arch/powerpc/include/asm/pci_io.h
index 9b738c383f..9b738c383f 100644
--- a/arch/ppc/include/asm/pci_io.h
+++ b/arch/powerpc/include/asm/pci_io.h
diff --git a/arch/ppc/include/asm/pnp.h b/arch/powerpc/include/asm/pnp.h
index 22ceba2253..22ceba2253 100644
--- a/arch/ppc/include/asm/pnp.h
+++ b/arch/powerpc/include/asm/pnp.h
diff --git a/arch/ppc/include/asm/posix_types.h b/arch/powerpc/include/asm/posix_types.h
index 9170728117..9170728117 100644
--- a/arch/ppc/include/asm/posix_types.h
+++ b/arch/powerpc/include/asm/posix_types.h
diff --git a/arch/ppc/include/asm/ppc4xx-ebc.h b/arch/powerpc/include/asm/ppc4xx-ebc.h
index 9c17e46252..9c17e46252 100644
--- a/arch/ppc/include/asm/ppc4xx-ebc.h
+++ b/arch/powerpc/include/asm/ppc4xx-ebc.h
diff --git a/arch/ppc/include/asm/ppc4xx-isram.h b/arch/powerpc/include/asm/ppc4xx-isram.h
index d6d17ac961..d6d17ac961 100644
--- a/arch/ppc/include/asm/ppc4xx-isram.h
+++ b/arch/powerpc/include/asm/ppc4xx-isram.h
diff --git a/arch/ppc/include/asm/ppc4xx-sdram.h b/arch/powerpc/include/asm/ppc4xx-sdram.h
index 92be514b40..92be514b40 100644
--- a/arch/ppc/include/asm/ppc4xx-sdram.h
+++ b/arch/powerpc/include/asm/ppc4xx-sdram.h
diff --git a/arch/ppc/include/asm/ppc4xx-uic.h b/arch/powerpc/include/asm/ppc4xx-uic.h
index 782d0454b7..782d0454b7 100644
--- a/arch/ppc/include/asm/ppc4xx-uic.h
+++ b/arch/powerpc/include/asm/ppc4xx-uic.h
diff --git a/arch/ppc/include/asm/ppc4xx_config.h b/arch/powerpc/include/asm/ppc4xx_config.h
index 49acb60aed..49acb60aed 100644
--- a/arch/ppc/include/asm/ppc4xx_config.h
+++ b/arch/powerpc/include/asm/ppc4xx_config.h
diff --git a/arch/ppc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 9ec319ae17..9ec319ae17 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
diff --git a/arch/ppc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 196613b9f1..cf09edf156 100644
--- a/arch/ppc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -14,7 +14,7 @@
  * that the overall structure is a multiple of 16 bytes in length.
  *
  * Note that the offsets of the fields in this struct correspond with
- * the PT_* values below.  This simplifies arch/ppc/kernel/ptrace.c.
+ * the PT_* values below.  This simplifies arch/powerpc/kernel/ptrace.c.
  */
 
 #include <linux/config.h>
diff --git a/arch/ppc/include/asm/residual.h b/arch/powerpc/include/asm/residual.h
index dc85edbc3c..dc85edbc3c 100644
--- a/arch/ppc/include/asm/residual.h
+++ b/arch/powerpc/include/asm/residual.h
diff --git a/arch/ppc/include/asm/sigcontext.h b/arch/powerpc/include/asm/sigcontext.h
index 715c868ab6..715c868ab6 100644
--- a/arch/ppc/include/asm/sigcontext.h
+++ b/arch/powerpc/include/asm/sigcontext.h
diff --git a/arch/ppc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h
index b11a28efd1..b11a28efd1 100644
--- a/arch/ppc/include/asm/signal.h
+++ b/arch/powerpc/include/asm/signal.h
diff --git a/arch/ppc/include/asm/status_led.h b/arch/powerpc/include/asm/status_led.h
index 037570993a..037570993a 100644
--- a/arch/ppc/include/asm/status_led.h
+++ b/arch/powerpc/include/asm/status_led.h
diff --git a/arch/ppc/include/asm/string.h b/arch/powerpc/include/asm/string.h
index d912a6b5fe..d912a6b5fe 100644
--- a/arch/ppc/include/asm/string.h
+++ b/arch/powerpc/include/asm/string.h
diff --git a/arch/ppc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index b27a6b753a..b27a6b753a 100644
--- a/arch/ppc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
diff --git a/arch/ppc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h
index ea2d22df27..ea2d22df27 100644
--- a/arch/ppc/include/asm/u-boot.h
+++ b/arch/powerpc/include/asm/u-boot.h
diff --git a/arch/ppc/include/asm/unaligned.h b/arch/powerpc/include/asm/unaligned.h
index 5f1b1e3c21..5f1b1e3c21 100644
--- a/arch/ppc/include/asm/unaligned.h
+++ b/arch/powerpc/include/asm/unaligned.h
diff --git a/arch/ppc/include/asm/xilinx_irq.h b/arch/powerpc/include/asm/xilinx_irq.h
index 61171c21ff..61171c21ff 100644
--- a/arch/ppc/include/asm/xilinx_irq.h
+++ b/arch/powerpc/include/asm/xilinx_irq.h
diff --git a/arch/ppc/lib/Makefile b/arch/powerpc/lib/Makefile
index 334e457805..334e457805 100644
--- a/arch/ppc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
diff --git a/arch/ppc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
index c48c240151..c48c240151 100644
--- a/arch/ppc/lib/bat_rw.c
+++ b/arch/powerpc/lib/bat_rw.c
diff --git a/arch/ppc/lib/board.c b/arch/powerpc/lib/board.c
index a30acee4fe..a30acee4fe 100644
--- a/arch/ppc/lib/board.c
+++ b/arch/powerpc/lib/board.c
diff --git a/arch/ppc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 0685a9331c..0685a9331c 100644
--- a/arch/ppc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
diff --git a/arch/ppc/lib/cache.c b/arch/powerpc/lib/cache.c
index 338b08bd77..338b08bd77 100644
--- a/arch/ppc/lib/cache.c
+++ b/arch/powerpc/lib/cache.c
diff --git a/arch/ppc/lib/extable.c b/arch/powerpc/lib/extable.c
index 7408d5c969..7408d5c969 100644
--- a/arch/ppc/lib/extable.c
+++ b/arch/powerpc/lib/extable.c
diff --git a/arch/ppc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index f6031707ae..f6031707ae 100644
--- a/arch/ppc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
diff --git a/arch/ppc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c
index d3eb1f35a9..d3eb1f35a9 100644
--- a/arch/ppc/lib/kgdb.c
+++ b/arch/powerpc/lib/kgdb.c
diff --git a/arch/ppc/lib/ppccache.S b/arch/powerpc/lib/ppccache.S
index 278a8048f8..278a8048f8 100644
--- a/arch/ppc/lib/ppccache.S
+++ b/arch/powerpc/lib/ppccache.S
diff --git a/arch/ppc/lib/ppcstring.S b/arch/powerpc/lib/ppcstring.S
index 97023a0555..97023a0555 100644
--- a/arch/ppc/lib/ppcstring.S
+++ b/arch/powerpc/lib/ppcstring.S
diff --git a/arch/ppc/lib/reloc.S b/arch/powerpc/lib/reloc.S
index 50f9a83fc6..50f9a83fc6 100644
--- a/arch/ppc/lib/reloc.S
+++ b/arch/powerpc/lib/reloc.S
diff --git a/arch/ppc/lib/ticks.S b/arch/powerpc/lib/ticks.S
index b8d25b7f46..b8d25b7f46 100644
--- a/arch/ppc/lib/ticks.S
+++ b/arch/powerpc/lib/ticks.S
diff --git a/arch/ppc/lib/time.c b/arch/powerpc/lib/time.c
index 29099612db..29099612db 100644
--- a/arch/ppc/lib/time.c
+++ b/arch/powerpc/lib/time.c
author	Stefan Roese <sr@denx.de>	2010-04-15 16:07:28 +0200
committer	Wolfgang Denk <wd@denx.de>	2010-04-21 23:42:38 +0200
commit	a47a12becf66f02a56da91c161e2edb625e9f20c (patch)
tree	6efae7137d26d1e610c5fd56b7aaa3c043ad2b71 /arch
parent	254ab7bd464657600aba69d840406f9358f3e116 (diff)