diff --git a/[refs] b/[refs]
index 54e69f65f1e5..7c0301a61b24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae6e30d2d6b4a7a45bb0d4fa4ecd56e65d24740
+refs/heads/master: c11dde85b62f9811eb2db656d9b0b4ad23d94871
diff --git a/trunk/arch/powerpc/platforms/cell/Makefile b/trunk/arch/powerpc/platforms/cell/Makefile
index c135a335e2e2..2f393f8caaed 100644
--- a/trunk/arch/powerpc/platforms/cell/Makefile
+++ b/trunk/arch/powerpc/platforms/cell/Makefile
@@ -39,4 +39,5 @@ obj-y					+= celleb_setup.o \
 					   beat_iommu.o
 
 obj-$(CONFIG_SERIAL_TXX9)		+= celleb_scc_sio.o
+obj-$(CONFIG_SPU_BASE)			+= beat_spu_priv1.o
 endif
diff --git a/trunk/arch/powerpc/platforms/celleb/spu_priv1.c b/trunk/arch/powerpc/platforms/cell/beat_spu_priv1.c
similarity index 99%
rename from trunk/arch/powerpc/platforms/celleb/spu_priv1.c
rename to trunk/arch/powerpc/platforms/cell/beat_spu_priv1.c
index ad22a148f309..bcc17f7fe8ad 100644
--- a/trunk/arch/powerpc/platforms/celleb/spu_priv1.c
+++ b/trunk/arch/powerpc/platforms/cell/beat_spu_priv1.c
@@ -24,7 +24,7 @@
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 
-#include "../cell/beat_wrapper.h"
+#include "beat_wrapper.h"
 
 static inline void _int_mask_set(struct spu *spu, int class, u64 mask)
 {
diff --git a/trunk/arch/powerpc/platforms/celleb/Makefile b/trunk/arch/powerpc/platforms/celleb/Makefile
index ad319436d8ff..fd9531fe5337 100644
--- a/trunk/arch/powerpc/platforms/celleb/Makefile
+++ b/trunk/arch/powerpc/platforms/celleb/Makefile
@@ -3,4 +3,3 @@ obj-y				+= interrupt.o \
 
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_PPC_UDBG_BEAT)	+= udbg_beat.o
-obj-$(CONFIG_SPU_BASE)		+= spu_priv1.o