diff --git a/[refs] b/[refs]
index 567f1bc807a2..77b00d57bab4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46ed55f647371008c33e06e61459192f96cc24ca
+refs/heads/master: e19217d42e3d12d74d9eca40827721a3ef1b251c
diff --git a/trunk/arch/powerpc/platforms/85xx/Makefile b/trunk/arch/powerpc/platforms/85xx/Makefile
index b443206e61af..70e1190809f8 100644
--- a/trunk/arch/powerpc/platforms/85xx/Makefile
+++ b/trunk/arch/powerpc/platforms/85xx/Makefile
@@ -1,4 +1,4 @@
 #
 # Makefile for the PowerPC 85xx linux kernel.
 #
-obj-$(CONFIG_PPC_85xx)	+= mpc85xx.o mpc85xx_ads.o
+obj-$(CONFIG_PPC_85xx)	+= misc.o mpc85xx_ads.o
diff --git a/trunk/arch/powerpc/platforms/85xx/mpc85xx.c b/trunk/arch/powerpc/platforms/85xx/misc.c
similarity index 95%
rename from trunk/arch/powerpc/platforms/85xx/mpc85xx.c
rename to trunk/arch/powerpc/platforms/85xx/misc.c
index 82510385d88a..26c5e822c7c8 100644
--- a/trunk/arch/powerpc/platforms/85xx/mpc85xx.c
+++ b/trunk/arch/powerpc/platforms/85xx/misc.c
@@ -16,8 +16,7 @@
 
 extern void abort(void);
 
-void
-mpc85xx_restart(char *cmd)
+void mpc85xx_restart(char *cmd)
 {
 	local_irq_disable();
 	abort();
@@ -28,4 +27,5 @@ phys_addr_t fixup_bigphys_addr(phys_addr_t addr, phys_addr_t size)
 {
 	return addr;
 };
+
 EXPORT_SYMBOL(fixup_bigphys_addr);