diff --git a/[refs] b/[refs]
index 319012bfdf46..992f485f6c24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 708d4f09647106d549c646dc459c7ccf2c237cc8
+refs/heads/master: 5de18cde3b748aafc6d187d7655ba42f2260501d
diff --git a/trunk/arch/sparc/Makefile b/trunk/arch/sparc/Makefile
index 3c043baf92bc..317aad600ed7 100644
--- a/trunk/arch/sparc/Makefile
+++ b/trunk/arch/sparc/Makefile
@@ -76,9 +76,8 @@ core-$(CONFIG_SPARC32) += arch/sparc/kernel/
 core-$(CONFIG_SPARC64) += arch/sparc64/kernel/
 core-y                 += arch/sparc/mm/ arch/sparc/math-emu/
 
-libs-$(CONFIG_SPARC32) += arch/sparc/prom/
+libs-y                 += arch/sparc/prom/
 libs-$(CONFIG_SPARC32) += arch/sparc/lib/
-libs-$(CONFIG_SPARC64) += arch/sparc64/prom/
 libs-$(CONFIG_SPARC64) += arch/sparc64/lib/
 
 drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/
diff --git a/trunk/arch/sparc/prom/Makefile b/trunk/arch/sparc/prom/Makefile
index 74ca9cceaeea..f8e0278b8b4f 100644
--- a/trunk/arch/sparc/prom/Makefile
+++ b/trunk/arch/sparc/prom/Makefile
@@ -1,6 +1,8 @@
 # Makefile for the Sun Boot PROM interface library under
 # Linux.
 #
+asflags := -ansi
+ccflags := -Werror
 
 lib-y                 := bootstr_$(BITS).o
 lib-$(CONFIG_SPARC32) += devmap.o
@@ -15,3 +17,5 @@ lib-$(CONFIG_SPARC32) += segment.o
 lib-y                 += console_$(BITS).o
 lib-y                 += printf_$(BITS).o
 lib-y                 += tree_$(BITS).o
+lib-$(CONFIG_SPARC64) += p1275.o
+lib-$(CONFIG_SPARC64) += cif.o
diff --git a/trunk/arch/sparc64/prom/bootstr.c b/trunk/arch/sparc/prom/bootstr_64.c
similarity index 100%
rename from trunk/arch/sparc64/prom/bootstr.c
rename to trunk/arch/sparc/prom/bootstr_64.c
diff --git a/trunk/arch/sparc64/prom/cif.S b/trunk/arch/sparc/prom/cif.S
similarity index 100%
rename from trunk/arch/sparc64/prom/cif.S
rename to trunk/arch/sparc/prom/cif.S
diff --git a/trunk/arch/sparc64/prom/console.c b/trunk/arch/sparc/prom/console_64.c
similarity index 100%
rename from trunk/arch/sparc64/prom/console.c
rename to trunk/arch/sparc/prom/console_64.c
diff --git a/trunk/arch/sparc64/prom/devops.c b/trunk/arch/sparc/prom/devops_64.c
similarity index 100%
rename from trunk/arch/sparc64/prom/devops.c
rename to trunk/arch/sparc/prom/devops_64.c
diff --git a/trunk/arch/sparc64/prom/init.c b/trunk/arch/sparc/prom/init_64.c
similarity index 100%
rename from trunk/arch/sparc64/prom/init.c
rename to trunk/arch/sparc/prom/init_64.c
diff --git a/trunk/arch/sparc64/prom/misc.c b/trunk/arch/sparc/prom/misc_64.c
similarity index 100%
rename from trunk/arch/sparc64/prom/misc.c
rename to trunk/arch/sparc/prom/misc_64.c
diff --git a/trunk/arch/sparc64/prom/p1275.c b/trunk/arch/sparc/prom/p1275.c
similarity index 100%
rename from trunk/arch/sparc64/prom/p1275.c
rename to trunk/arch/sparc/prom/p1275.c
diff --git a/trunk/arch/sparc64/prom/printf.c b/trunk/arch/sparc/prom/printf_64.c
similarity index 100%
rename from trunk/arch/sparc64/prom/printf.c
rename to trunk/arch/sparc/prom/printf_64.c
diff --git a/trunk/arch/sparc64/prom/tree.c b/trunk/arch/sparc/prom/tree_64.c
similarity index 100%
rename from trunk/arch/sparc64/prom/tree.c
rename to trunk/arch/sparc/prom/tree_64.c
diff --git a/trunk/arch/sparc64/prom/Makefile b/trunk/arch/sparc64/prom/Makefile
deleted file mode 100644
index 8c94483ca54d..000000000000
--- a/trunk/arch/sparc64/prom/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Makefile for the Sun Boot PROM interface library under
-# Linux.
-#
-
-EXTRA_AFLAGS := -ansi
-EXTRA_CFLAGS := -Werror
-
-lib-y   := bootstr.o devops.o init.o misc.o \
-	   tree.o console.o printf.o p1275.o cif.o