From e58e7655e534a79daa0447453ee87ccc3e048c51 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Mon, 20 Aug 2007 07:27:07 -0500
Subject: [PATCH] --- yaml --- r: 67232 b: refs/heads/master c:
 15f6527e8e63e793f8ab1ddce4ed3c487ebd0d42 h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/arch/powerpc/Makefile                          | 2 +-
 trunk/arch/powerpc/kernel/Makefile                   | 2 +-
 trunk/arch/powerpc/kernel/{head_4xx.S => head_40x.S} | 0
 trunk/arch/powerpc/mm/{4xx_mmu.c => 40x_mmu.c}       | 0
 trunk/arch/powerpc/mm/Makefile                       | 2 +-
 trunk/arch/powerpc/platforms/{4xx => 40x}/Kconfig    | 0
 trunk/arch/powerpc/platforms/{4xx => 40x}/Makefile   | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename trunk/arch/powerpc/kernel/{head_4xx.S => head_40x.S} (100%)
 rename trunk/arch/powerpc/mm/{4xx_mmu.c => 40x_mmu.c} (100%)
 rename trunk/arch/powerpc/platforms/{4xx => 40x}/Kconfig (100%)
 rename trunk/arch/powerpc/platforms/{4xx => 40x}/Makefile (100%)

diff --git a/[refs] b/[refs]
index eb5ae5194334..cb473e5b4739 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a65517f857bf6657839957617af942a4b631fba5
+refs/heads/master: 15f6527e8e63e793f8ab1ddce4ed3c487ebd0d42
diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile
index 6c1e36c33faa..8e59c0c405ad 100644
--- a/trunk/arch/powerpc/Makefile
+++ b/trunk/arch/powerpc/Makefile
@@ -123,7 +123,7 @@ CFLAGS += $(cpu-as-y)
 head-y				:= arch/powerpc/kernel/head_32.o
 head-$(CONFIG_PPC64)		:= arch/powerpc/kernel/head_64.o
 head-$(CONFIG_8xx)		:= arch/powerpc/kernel/head_8xx.o
-head-$(CONFIG_4xx)		:= arch/powerpc/kernel/head_4xx.o
+head-$(CONFIG_40x)		:= arch/powerpc/kernel/head_40x.o
 head-$(CONFIG_44x)		:= arch/powerpc/kernel/head_44x.o
 head-$(CONFIG_FSL_BOOKE)	:= arch/powerpc/kernel/head_fsl_booke.o
 
diff --git a/trunk/arch/powerpc/kernel/Makefile b/trunk/arch/powerpc/kernel/Makefile
index b0cb2e662c25..a4850dd8764f 100644
--- a/trunk/arch/powerpc/kernel/Makefile
+++ b/trunk/arch/powerpc/kernel/Makefile
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_PPC_MERGE),y)
 
 extra-$(CONFIG_PPC_STD_MMU)	:= head_32.o
 extra-$(CONFIG_PPC64)		:= head_64.o
-extra-$(CONFIG_40x)		:= head_4xx.o
+extra-$(CONFIG_40x)		:= head_40x.o
 extra-$(CONFIG_44x)		:= head_44x.o
 extra-$(CONFIG_FSL_BOOKE)	:= head_fsl_booke.o
 extra-$(CONFIG_8xx)		:= head_8xx.o
diff --git a/trunk/arch/powerpc/kernel/head_4xx.S b/trunk/arch/powerpc/kernel/head_40x.S
similarity index 100%
rename from trunk/arch/powerpc/kernel/head_4xx.S
rename to trunk/arch/powerpc/kernel/head_40x.S
diff --git a/trunk/arch/powerpc/mm/4xx_mmu.c b/trunk/arch/powerpc/mm/40x_mmu.c
similarity index 100%
rename from trunk/arch/powerpc/mm/4xx_mmu.c
rename to trunk/arch/powerpc/mm/40x_mmu.c
diff --git a/trunk/arch/powerpc/mm/Makefile b/trunk/arch/powerpc/mm/Makefile
index 7e4d27ad3dee..bf20fa688809 100644
--- a/trunk/arch/powerpc/mm/Makefile
+++ b/trunk/arch/powerpc/mm/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_PPC64)		+= init_64.o pgtable_64.o mmu_context_64.o \
 				   hash_utils_64.o hash_low_64.o tlb_64.o \
 				   slb_low.o slb.o stab.o mmap.o $(hash-y)
 obj-$(CONFIG_PPC_STD_MMU_32)	+= ppc_mmu_32.o hash_low_32.o tlb_32.o
-obj-$(CONFIG_40x)		+= 4xx_mmu.o
+obj-$(CONFIG_40x)		+= 40x_mmu.o
 obj-$(CONFIG_44x)		+= 44x_mmu.o
 obj-$(CONFIG_FSL_BOOKE)		+= fsl_booke_mmu.o
 obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o
diff --git a/trunk/arch/powerpc/platforms/4xx/Kconfig b/trunk/arch/powerpc/platforms/40x/Kconfig
similarity index 100%
rename from trunk/arch/powerpc/platforms/4xx/Kconfig
rename to trunk/arch/powerpc/platforms/40x/Kconfig
diff --git a/trunk/arch/powerpc/platforms/4xx/Makefile b/trunk/arch/powerpc/platforms/40x/Makefile
similarity index 100%
rename from trunk/arch/powerpc/platforms/4xx/Makefile
rename to trunk/arch/powerpc/platforms/40x/Makefile