diff options
author | Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2008-04-24 05:29:50 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 07:08:13 -0400 |
commit | c11dde85b62f9811eb2db656d9b0b4ad23d94871 (patch) | |
tree | 778f3409ce0f5f8efb4b45443d271863196a1124 /arch/powerpc | |
parent | 8ae6e30d2d6b4a7a45bb0d4fa4ecd56e65d24740 (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/Makefile | 1 | ||||
-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/Makefile | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile index c135a335e2e2..2f393f8caaed 100644 --- a/arch/powerpc/platforms/cell/Makefile +++ b/arch/powerpc/platforms/cell/Makefile | |||
@@ -39,4 +39,5 @@ obj-y += celleb_setup.o \ | |||
39 | beat_iommu.o | 39 | beat_iommu.o |
40 | 40 | ||
41 | obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o | 41 | obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o |
42 | obj-$(CONFIG_SPU_BASE) += beat_spu_priv1.o | ||
42 | endif | 43 | endif |
diff --git a/arch/powerpc/platforms/celleb/spu_priv1.c b/arch/powerpc/platforms/cell/beat_spu_priv1.c index ad22a148f309..bcc17f7fe8ad 100644 --- a/arch/powerpc/platforms/celleb/spu_priv1.c +++ b/arch/powerpc/platforms/cell/beat_spu_priv1.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <asm/spu.h> | 24 | #include <asm/spu.h> |
25 | #include <asm/spu_priv1.h> | 25 | #include <asm/spu_priv1.h> |
26 | 26 | ||
27 | #include "../cell/beat_wrapper.h" | 27 | #include "beat_wrapper.h" |
28 | 28 | ||
29 | static inline void _int_mask_set(struct spu *spu, int class, u64 mask) | 29 | static inline void _int_mask_set(struct spu *spu, int class, u64 mask) |
30 | { | 30 | { |
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile index ad319436d8ff..fd9531fe5337 100644 --- a/arch/powerpc/platforms/celleb/Makefile +++ b/arch/powerpc/platforms/celleb/Makefile | |||
@@ -3,4 +3,3 @@ obj-y += interrupt.o \ | |||
3 | 3 | ||
4 | obj-$(CONFIG_SMP) += smp.o | 4 | obj-$(CONFIG_SMP) += smp.o |
5 | obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o | 5 | obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o |
6 | obj-$(CONFIG_SPU_BASE) += spu_priv1.o | ||