---

yaml --- r: 93468 b: refs/heads/master c: 8ae6e30 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 6e7adc0 · 6e7adc0
1 parent 4b6a61a
commit 6e7adc0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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 → ...k/arch/powerpc/platforms/cell/beat_htab.c b/trunk/arch/powerpc/platforms/celleb/htab.c → ...k/arch/powerpc/platforms/cell/beat_htab.c
@@ -32,7 +32,7 @@
 #include <asm/machdep.h>
 #include <asm/udbg.h>
 
-#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 → .../arch/powerpc/platforms/cell/beat_iommu.c b/trunk/arch/powerpc/platforms/celleb/iommu.c → .../arch/powerpc/platforms/cell/beat_iommu.c
@@ -26,7 +26,7 @@
 
 #include <asm/machdep.h>
 
-#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
@@ -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