11 files changed, 9 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 3b6ee08701f5..b76d17809ce8 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
index 74c817448948..74c817448948 100644
--- a/arch/powerpc/platforms/celleb/hvCall.S
+++ b/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
index 8580dc7e1798..8580dc7e1798 100644
--- a/arch/powerpc/platforms/celleb/beat_syscall.h
+++ b/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
index b47dfda48d06..b47dfda48d06 100644
--- a/arch/powerpc/platforms/celleb/beat_wrapper.h
+++ b/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 d0dad24f2de2..401557cbb6a8 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 edb6d5e858a1..5f612c12b26b 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 b64b171f245b..eb99d0b66470 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 81467ff055c8..18eaed1107a2 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 69562a867876..bb7bdad95e4c 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 93b0efddd658..3eda42381224 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 bcc17f7fe8ad..ad22a148f309 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)
 {