---

yaml --- r: 93469 b: refs/heads/master c: c11dde8 h: refs/heads/master i: 93467: 4b6a61a v: v3
git-mirror · Apr 24, 2008 · 4d92444 · 4d92444
1 parent 6e7adc0
commit 4d92444
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae6e30d2d6b4a7a45bb0d4fa4ecd56e65d24740
+refs/heads/master: c11dde85b62f9811eb2db656d9b0b4ad23d94871
diff --git a/trunk/arch/powerpc/platforms/cell/Makefile b/trunk/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 → ...h/powerpc/platforms/cell/beat_spu_priv1.c b/...arch/powerpc/platforms/celleb/spu_priv1.c → ...h/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/trunk/arch/powerpc/platforms/celleb/Makefile b/trunk/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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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