summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorIshizaki Kou <kou.ishizaki@toshiba.co.jp>2008-04-24 19:29:50 +1000
committerPaul Mackerras <paulus@samba.org>2008-04-24 21:08:13 +1000
commitc11dde85b62f9811eb2db656d9b0b4ad23d94871 (patch)
tree778f3409ce0f5f8efb4b45443d271863196a1124 /arch/powerpc
parent8ae6e30d2d6b4a7a45bb0d4fa4ecd56e65d24740 (diff)
[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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/cell/Makefile1
-rw-r--r--arch/powerpc/platforms/cell/beat_spu_priv1.c (renamed from arch/powerpc/platforms/celleb/spu_priv1.c)2
-rw-r--r--arch/powerpc/platforms/celleb/Makefile1
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index c135a335e2e..2f393f8caae 100644
--- 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
index ad22a148f30..bcc17f7fe8a 100644
--- 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 ad319436d8f..fd9531fe533 100644
--- 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