From 4d924441383700e322d17b81b73242db9df74ee6 Mon Sep 17 00:00:00 2001 From: Ishizaki Kou Date: Thu, 24 Apr 2008 19:29:50 +1000 Subject: [PATCH] --- yaml --- r: 93469 b: refs/heads/master c: c11dde85b62f9811eb2db656d9b0b4ad23d94871 h: refs/heads/master i: 93467: 4b6a61ae16c393c913ceae8fa960b0065179ab61 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/Makefile | 1 + .../platforms/{celleb/spu_priv1.c => cell/beat_spu_priv1.c} | 2 +- trunk/arch/powerpc/platforms/celleb/Makefile | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/powerpc/platforms/{celleb/spu_priv1.c => cell/beat_spu_priv1.c} (99%) diff --git a/[refs] b/[refs] index 54e69f65f1e5..7c0301a61b24 100644 --- 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 index c135a335e2e2..2f393f8caaed 100644 --- 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/trunk/arch/powerpc/platforms/celleb/spu_priv1.c b/trunk/arch/powerpc/platforms/cell/beat_spu_priv1.c similarity index 99% rename from trunk/arch/powerpc/platforms/celleb/spu_priv1.c rename to trunk/arch/powerpc/platforms/cell/beat_spu_priv1.c index ad22a148f309..bcc17f7fe8ad 100644 --- a/trunk/arch/powerpc/platforms/celleb/spu_priv1.c +++ b/trunk/arch/powerpc/platforms/cell/beat_spu_priv1.c @@ -24,7 +24,7 @@ #include #include -#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 index ad319436d8ff..fd9531fe5337 100644 --- 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