[POWERPC] celleb: Move a file for SPU on Beat

This moves SPU support code on Beat into platforms/cell/.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index c135a335e2e2466a1dae54ef5a31c4817efe7c8c..2f393f8caaedaeda2ea217271067103a47785f0f 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/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/arch/powerpc/platforms/celleb/spu_priv1.c b/arch/powerpc/platforms/cell/beat_spu_priv1.c
similarity index 99%
rename from arch/powerpc/platforms/celleb/spu_priv1.c
rename to arch/powerpc/platforms/cell/beat_spu_priv1.c
index ad22a148f309860e769025746103c93b031cea77..bcc17f7fe8adfaba96ba7763ae675af31fb27c15 100644 (file)
--- a/arch/powerpc/platforms/celleb/spu_priv1.c
+++ b/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/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
index ad319436d8ff2c88fe8540f745cee17cb080075f..fd9531fe53379570c7b522a97c8cd6e64f7e144b 100644 (file)
--- a/arch/powerpc/platforms/celleb/Makefile
+++ b/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