diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 3b6ee08701f5313f5f7207569ec99a9cf4c33c9f..b76d17809ce8b8d9ecb6d6ad1ee8960596b60e7a 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -34,7 +34,8 @@ ifeq ($(CONFIG_PPC_CELLEB),y)
 obj-y					+= celleb_setup.o \
 					   celleb_pci.o celleb_scc_epci.o \
 					   celleb_scc_uhc.o \
-					   io-workarounds.o spider-pci.o
+					   io-workarounds.o spider-pci.o \
+					   beat_hvCall.o
 
 obj-$(CONFIG_SERIAL_TXX9)		+= celleb_scc_sio.o
 endif
diff --git a/arch/powerpc/platforms/celleb/hvCall.S b/arch/powerpc/platforms/cell/beat_hvCall.S
similarity index 100%
rename from arch/powerpc/platforms/celleb/hvCall.S
rename to arch/powerpc/platforms/cell/beat_hvCall.S
diff --git a/arch/powerpc/platforms/celleb/beat_syscall.h b/arch/powerpc/platforms/cell/beat_syscall.h
similarity index 100%
rename from arch/powerpc/platforms/celleb/beat_syscall.h
rename to arch/powerpc/platforms/cell/beat_syscall.h
diff --git a/arch/powerpc/platforms/celleb/beat_wrapper.h b/arch/powerpc/platforms/cell/beat_wrapper.h
similarity index 100%
rename from arch/powerpc/platforms/celleb/beat_wrapper.h
rename to arch/powerpc/platforms/cell/beat_wrapper.h
diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index d0dad24f2de284ad5a63bbaf49ea4d77db7e8bd1..401557cbb6a8ebc59bbd1194bc48c7a84e3d55d3 100644
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -57,7 +57,7 @@
 #include <asm/cell-regs.h>
 
 #include "../celleb/interrupt.h"
-#include "../celleb/beat_wrapper.h"
+#include "beat_wrapper.h"
 #include "../celleb/beat.h"
 #include "celleb_pci.h"
 #include "interrupt.h"
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
index edb6d5e858a1a3b84858856702598f6c26e533ff..5f612c12b26b9086d75234f0d617c911f245efc9 100644
--- a/arch/powerpc/platforms/celleb/Makefile
+++ b/arch/powerpc/platforms/celleb/Makefile
@@ -1,5 +1,5 @@
 obj-y				+= interrupt.o iommu.o \
-				   htab.o beat.o hvCall.o
+				   htab.o beat.o
 
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_PPC_UDBG_BEAT)	+= udbg_beat.o
diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c
index b64b171f245b513e57ca5d7174c05384aecccf30..eb99d0b66470ec51d676a94a3127679f9f34dd98 100644
--- a/arch/powerpc/platforms/celleb/beat.c
+++ b/arch/powerpc/platforms/celleb/beat.c
@@ -31,7 +31,7 @@
 #include <asm/machdep.h>
 #include <asm/firmware.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 #include "beat.h"
 #include "interrupt.h"
 
diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/celleb/htab.c
index 81467ff055c8313152862f02eb8d828d3f349951..18eaed1107a2a3808a8e2c4702ad95e942452543 100644
--- a/arch/powerpc/platforms/celleb/htab.c
+++ b/arch/powerpc/platforms/celleb/htab.c
@@ -32,7 +32,7 @@
 #include <asm/machdep.h>
 #include <asm/udbg.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 #ifdef DEBUG_LOW
 #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0)
diff --git a/arch/powerpc/platforms/celleb/interrupt.c b/arch/powerpc/platforms/celleb/interrupt.c
index 69562a867876ebd54dbdd7e3f4ac85f2b34fd377..bb7bdad95e4c364c161a2df7a851412efa62c526 100644
--- a/arch/powerpc/platforms/celleb/interrupt.c
+++ b/arch/powerpc/platforms/celleb/interrupt.c
@@ -27,7 +27,7 @@
 #include <asm/machdep.h>
 
 #include "interrupt.h"
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 #define	MAX_IRQS	NR_IRQS
 static DEFINE_SPINLOCK(beatic_irq_mask_lock);
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c
index 93b0efddd658dfef78de8b18abfe3bd58063dab2..3eda42381224e210363a9275a3022379eedd52ac 100644
--- a/arch/powerpc/platforms/celleb/iommu.c
+++ b/arch/powerpc/platforms/celleb/iommu.c
@@ -26,7 +26,7 @@
 
 #include <asm/machdep.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 #define DMA_FLAGS 0xf800000000000000UL	/* r/w permitted, coherency required,
 					   strongest order */
diff --git a/arch/powerpc/platforms/celleb/spu_priv1.c b/arch/powerpc/platforms/celleb/spu_priv1.c
index bcc17f7fe8adfaba96ba7763ae675af31fb27c15..ad22a148f309860e769025746103c93b031cea77 100644
--- a/arch/powerpc/platforms/celleb/spu_priv1.c
+++ b/arch/powerpc/platforms/celleb/spu_priv1.c
@@ -24,7 +24,7 @@
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 
-#include "beat_wrapper.h"
+#include "../cell/beat_wrapper.h"
 
 static inline void _int_mask_set(struct spu *spu, int class, u64 mask)
 {