diff --git a/[refs] b/[refs]
index 4ecc8b945067..5f5dbe0ee257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcd71fe6b1a8694747b0b451c9ec22d813ad7e27
+refs/heads/master: 2d6b3de2374dd8c9f5ab23d57c7bbcda08553356
diff --git a/trunk/arch/powerpc/platforms/pasemi/setup.c b/trunk/arch/powerpc/platforms/pasemi/setup.c
index c64fb5bfb37e..153051eb6d93 100644
--- a/trunk/arch/powerpc/platforms/pasemi/setup.c
+++ b/trunk/arch/powerpc/platforms/pasemi/setup.c
@@ -44,10 +44,6 @@
 
 #include "pasemi.h"
 
-#if !defined(CONFIG_SMP)
-static void smp_send_stop(void) {}
-#endif
-
 /* SDC reset register, must be pre-mapped at reset time */
 static void __iomem *reset_reg;