---

yaml --- r: 93470 b: refs/heads/master c: ad2c698 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · cddc0b7 · cddc0b7
1 parent 4d92444
commit cddc0b7
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c11dde85b62f9811eb2db656d9b0b4ad23d94871
+refs/heads/master: ad2c6987978d17b58204926e9be776955935f8b1
diff --git a/trunk/arch/powerpc/platforms/Makefile b/trunk/arch/powerpc/platforms/Makefile
@@ -24,5 +24,4 @@ obj-$(CONFIG_PPC_MAPLE)		+= maple/
 obj-$(CONFIG_PPC_PASEMI)	+= pasemi/
 obj-$(CONFIG_PPC_CELL)		+= cell/
 obj-$(CONFIG_PPC_PS3)		+= ps3/
-obj-$(CONFIG_PPC_CELLEB)	+= celleb/
 obj-$(CONFIG_EMBEDDED6xx)	+= embedded6xx/
diff --git a/trunk/arch/powerpc/platforms/cell/Makefile b/trunk/arch/powerpc/platforms/cell/Makefile
@@ -35,9 +35,11 @@ obj-y					+= celleb_setup.o \
 					   celleb_pci.o celleb_scc_epci.o \
 					   celleb_scc_uhc.o \
 					   io-workarounds.o spider-pci.o \
-					   beat_htab.o beat_hvCall.o \
-					   beat_iommu.o
+					   beat.o beat_htab.o beat_hvCall.o \
+					   beat_interrupt.o beat_iommu.o
 
+obj-$(CONFIG_SMP)			+= beat_smp.o
+obj-$(CONFIG_PPC_UDBG_BEAT)		+= beat_udbg.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/beat.c → trunk/arch/powerpc/platforms/cell/beat.c b/trunk/arch/powerpc/platforms/celleb/beat.c → trunk/arch/powerpc/platforms/cell/beat.c
@@ -31,9 +31,9 @@
 #include <asm/machdep.h>
 #include <asm/firmware.h>
 
-#include "../cell/beat_wrapper.h"
+#include "beat_wrapper.h"
 #include "beat.h"
-#include "interrupt.h"
+#include "beat_interrupt.h"
 
 static int beat_pm_poweroff_flag;
 

diff --git a/trunk/arch/powerpc/platforms/celleb/beat.h → trunk/arch/powerpc/platforms/cell/beat.h b/trunk/arch/powerpc/platforms/celleb/beat.h → trunk/arch/powerpc/platforms/cell/beat.h
diff --git a/...arch/powerpc/platforms/celleb/interrupt.c → ...h/powerpc/platforms/cell/beat_interrupt.c b/...arch/powerpc/platforms/celleb/interrupt.c → ...h/powerpc/platforms/cell/beat_interrupt.c
@@ -26,8 +26,8 @@
 
 #include <asm/machdep.h>
 
-#include "interrupt.h"
-#include "../cell/beat_wrapper.h"
+#include "beat_interrupt.h"
+#include "beat_wrapper.h"
 
 #define	MAX_IRQS	NR_IRQS
 static DEFINE_SPINLOCK(beatic_irq_mask_lock);

diff --git a/...arch/powerpc/platforms/celleb/interrupt.h → ...h/powerpc/platforms/cell/beat_interrupt.h b/...arch/powerpc/platforms/celleb/interrupt.h → ...h/powerpc/platforms/cell/beat_interrupt.h
diff --git a/trunk/arch/powerpc/platforms/celleb/smp.c → trunk/arch/powerpc/platforms/cell/beat_smp.c b/trunk/arch/powerpc/platforms/celleb/smp.c → trunk/arch/powerpc/platforms/cell/beat_smp.c
@@ -37,7 +37,7 @@
 #include <asm/machdep.h>
 #include <asm/udbg.h>
 
-#include "interrupt.h"
+#include "beat_interrupt.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)

diff --git a/...arch/powerpc/platforms/celleb/udbg_beat.c → ...k/arch/powerpc/platforms/cell/beat_udbg.c b/...arch/powerpc/platforms/celleb/udbg_beat.c → ...k/arch/powerpc/platforms/cell/beat_udbg.c
diff --git a/trunk/arch/powerpc/platforms/cell/celleb_setup.c b/trunk/arch/powerpc/platforms/cell/celleb_setup.c
@@ -56,9 +56,9 @@
 #include <asm/rtas.h>
 #include <asm/cell-regs.h>
 
-#include "../celleb/interrupt.h"
+#include "beat_interrupt.h"
 #include "beat_wrapper.h"
-#include "../celleb/beat.h"
+#include "beat.h"
 #include "celleb_pci.h"
 #include "interrupt.h"
 #include "pervasive.h"

diff --git a/trunk/arch/powerpc/platforms/celleb/Makefile b/trunk/arch/powerpc/platforms/celleb/Makefile