From: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Date: Thu, 24 Apr 2008 09:29:50 +0000 (+1000)
Subject: [POWERPC] celleb: Move a file for SPU on Beat
X-Git-Tag: v2.6.26-rc1~1055^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c11dde85b62f9811eb2db656d9b0b4ad23d94871;p=linux-2.6

[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 c135a335e2..2f393f8caa 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
similarity index 99%
rename from arch/powerpc/platforms/celleb/spu_priv1.c
rename to arch/powerpc/platforms/cell/beat_spu_priv1.c
index ad22a148f3..bcc17f7fe8 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 ad319436d8..fd9531fe53 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