From 6e7adc0cf547870787dc2d7b6b17f9eed8ef1e81 Mon Sep 17 00:00:00 2001 From: Ishizaki Kou Date: Thu, 24 Apr 2008 19:28:48 +1000 Subject: [PATCH] --- yaml --- r: 93468 b: refs/heads/master c: 8ae6e30d2d6b4a7a45bb0d4fa4ecd56e65d24740 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/Makefile | 3 ++- .../powerpc/platforms/{celleb/htab.c => cell/beat_htab.c} | 2 +- .../powerpc/platforms/{celleb/iommu.c => cell/beat_iommu.c} | 2 +- trunk/arch/powerpc/platforms/celleb/Makefile | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) rename trunk/arch/powerpc/platforms/{celleb/htab.c => cell/beat_htab.c} (99%) rename trunk/arch/powerpc/platforms/{celleb/iommu.c => cell/beat_iommu.c} (98%) diff --git a/[refs] b/[refs] index 1c2beb9f7c9a..54e69f65f1e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a96dfe84b53cc05abe8c7f4d1dfd7b03a3e314a +refs/heads/master: 8ae6e30d2d6b4a7a45bb0d4fa4ecd56e65d24740 diff --git a/trunk/arch/powerpc/platforms/cell/Makefile b/trunk/arch/powerpc/platforms/cell/Makefile index b76d17809ce8..c135a335e2e2 100644 --- a/trunk/arch/powerpc/platforms/cell/Makefile +++ b/trunk/arch/powerpc/platforms/cell/Makefile @@ -35,7 +35,8 @@ obj-y += celleb_setup.o \ celleb_pci.o celleb_scc_epci.o \ celleb_scc_uhc.o \ io-workarounds.o spider-pci.o \ - beat_hvCall.o + beat_htab.o beat_hvCall.o \ + beat_iommu.o obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o endif diff --git a/trunk/arch/powerpc/platforms/celleb/htab.c b/trunk/arch/powerpc/platforms/cell/beat_htab.c similarity index 99% rename from trunk/arch/powerpc/platforms/celleb/htab.c rename to trunk/arch/powerpc/platforms/cell/beat_htab.c index 18eaed1107a2..81467ff055c8 100644 --- a/trunk/arch/powerpc/platforms/celleb/htab.c +++ b/trunk/arch/powerpc/platforms/cell/beat_htab.c @@ -32,7 +32,7 @@ #include #include -#include "../cell/beat_wrapper.h" +#include "beat_wrapper.h" #ifdef DEBUG_LOW #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0) diff --git a/trunk/arch/powerpc/platforms/celleb/iommu.c b/trunk/arch/powerpc/platforms/cell/beat_iommu.c similarity index 98% rename from trunk/arch/powerpc/platforms/celleb/iommu.c rename to trunk/arch/powerpc/platforms/cell/beat_iommu.c index 3eda42381224..93b0efddd658 100644 --- a/trunk/arch/powerpc/platforms/celleb/iommu.c +++ b/trunk/arch/powerpc/platforms/cell/beat_iommu.c @@ -26,7 +26,7 @@ #include -#include "../cell/beat_wrapper.h" +#include "beat_wrapper.h" #define DMA_FLAGS 0xf800000000000000UL /* r/w permitted, coherency required, strongest order */ diff --git a/trunk/arch/powerpc/platforms/celleb/Makefile b/trunk/arch/powerpc/platforms/celleb/Makefile index 5f612c12b26b..ad319436d8ff 100644 --- a/trunk/arch/powerpc/platforms/celleb/Makefile +++ b/trunk/arch/powerpc/platforms/celleb/Makefile @@ -1,5 +1,5 @@ -obj-y += interrupt.o iommu.o \ - htab.o beat.o +obj-y += interrupt.o \ + beat.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o