From c11dde85b62f9811eb2db656d9b0b4ad23d94871 Mon Sep 17 00:00:00 2001 From: Ishizaki Kou Date: Thu, 24 Apr 2008 19:29:50 +1000 Subject: [PATCH] [POWERPC] celleb: Move a file for SPU on Beat This moves SPU support code on Beat into platforms/cell/. Signed-off-by: Kou Ishizaki Acked-by: Arnd Bergmann Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras --- arch/powerpc/platforms/cell/Makefile | 1 + .../platforms/{celleb/spu_priv1.c => cell/beat_spu_priv1.c} | 2 +- arch/powerpc/platforms/celleb/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/powerpc/platforms/{celleb/spu_priv1.c => cell/beat_spu_priv1.c} (99%) 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 \ 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 ad22a148f309..bcc17f7fe8ad 100644 --- a/arch/powerpc/platforms/celleb/spu_priv1.c +++ b/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/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 \ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o -obj-$(CONFIG_SPU_BASE) += spu_priv1.o -- 2.30.2