9 files changed, 29 insertions, 29 deletions

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index f38c50b4ce56..87454c526973 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -45,7 +45,6 @@ source "arch/powerpc/platforms/powermac/Kconfig"
 source "arch/powerpc/platforms/prep/Kconfig"
 source "arch/powerpc/platforms/maple/Kconfig"
 source "arch/powerpc/platforms/pasemi/Kconfig"
-source "arch/powerpc/platforms/celleb/Kconfig"
 source "arch/powerpc/platforms/ps3/Kconfig"
 source "arch/powerpc/platforms/cell/Kconfig"
 source "arch/powerpc/platforms/8xx/Kconfig"
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 2f169991896d..3959fcfe731c 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -25,6 +25,19 @@ config PPC_IBM_CELL_BLADE
         select PPC_UDBG_16550
         select UDBG_RTAS_CONSOLE
 
+config PPC_CELLEB
+        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
+        depends on PPC_MULTIPLATFORM && PPC64
+        select PPC_CELL
+        select PPC_CELL_NATIVE
+        select PPC_RTAS
+        select PPC_INDIRECT_IO
+        select PPC_OF_PLATFORM_PCI
+        select HAS_TXX9_SERIAL
+        select PPC_UDBG_BEAT
+        select USB_OHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_MMIO
+
 menu "Cell Broadband Engine options"
         depends on PPC_CELL
 
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 81c26f32453e..b644f5717fc2 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -31,5 +31,7 @@ obj-$(CONFIG_PCI_MSI)			+= axon_msi.o
 
 # celleb stuff
 ifeq ($(CONFIG_PPC_CELLEB),y)
-obj-y                                   += io-workarounds.o spider-pci.o
+obj-y                                   += celleb_setup.o \
+                                           celleb_pci.o \
+                                           io-workarounds.o spider-pci.o
 endif
diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index 539d2cc59542..ff25e6088480 100644
--- a/arch/powerpc/platforms/celleb/pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -37,13 +37,11 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
-#include <asm/machdep.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
 
-#include "../cell/io-workarounds.h"
-#include "pci.h"
-#include "interrupt.h"
+#include "io-workarounds.h"
+#include "celleb_pci.h"
 
 #define MAX_PCI_DEVICES    32
 #define MAX_PCI_FUNCTIONS   8
@@ -191,7 +189,7 @@ static int celleb_fake_pci_read_config(struct pci_bus *bus,
 
 
 static int celleb_fake_pci_write_config(struct pci_bus *bus,
-                 unsigned int devfn, int where, int size, u32 val)
+                unsigned int devfn, int where, int size, u32 val)
 {
         char *config;
         struct device_node *node;
diff --git a/arch/powerpc/platforms/celleb/pci.h b/arch/powerpc/platforms/cell/celleb_pci.h
index cabb3a108c31..79e59848cb62 100644
--- a/arch/powerpc/platforms/celleb/pci.h
+++ b/arch/powerpc/platforms/cell/celleb_pci.h
@@ -27,7 +27,7 @@
 #include <asm/prom.h>
 #include <asm/ppc-pci.h>
 
-#include "../cell/io-workarounds.h"
+#include "io-workarounds.h"
 
 struct celleb_phb_spec {
         int (*setup)(struct device_node *, struct pci_controller *);
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index ff8209e61e84..d0dad24f2de2 100644
--- a/arch/powerpc/platforms/celleb/setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -56,13 +56,13 @@
 #include <asm/rtas.h>
 #include <asm/cell-regs.h>
 
+#include "../celleb/interrupt.h"
+#include "../celleb/beat_wrapper.h"
+#include "../celleb/beat.h"
+#include "celleb_pci.h"
 #include "interrupt.h"
-#include "beat_wrapper.h"
-#include "beat.h"
-#include "pci.h"
-#include "../cell/interrupt.h"
-#include "../cell/pervasive.h"
-#include "../cell/ras.h"
+#include "pervasive.h"
+#include "ras.h"
 
 static char celleb_machine_type[128] = "Celleb";
 
diff --git a/arch/powerpc/platforms/celleb/Kconfig b/arch/powerpc/platforms/celleb/Kconfig
deleted file mode 100644
index 372891edcdd2..000000000000
--- a/arch/powerpc/platforms/celleb/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-config PPC_CELLEB
-        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
-        depends on PPC_MULTIPLATFORM && PPC64
-        select PPC_CELL
-        select PPC_CELL_NATIVE
-        select PPC_RTAS
-        select PPC_INDIRECT_IO
-        select PPC_OF_PLATFORM_PCI
-        select HAS_TXX9_SERIAL
-        select PPC_UDBG_BEAT
-        select USB_OHCI_BIG_ENDIAN_MMIO
-        select USB_EHCI_BIG_ENDIAN_MMIO
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
index 6d51a3c00713..5b1096b40afb 100644
--- a/arch/powerpc/platforms/celleb/Makefile
+++ b/arch/powerpc/platforms/celleb/Makefile
@@ -1,5 +1,5 @@
-obj-y                           += interrupt.o iommu.o setup.o \
-                                   htab.o beat.o hvCall.o pci.o \
+obj-y                           += interrupt.o iommu.o \
+                                   htab.o beat.o hvCall.o \
                                    scc_epci.o scc_uhc.o
 
 obj-$(CONFIG_SMP)               += smp.o
diff --git a/arch/powerpc/platforms/celleb/scc_epci.c b/arch/powerpc/platforms/celleb/scc_epci.c
index b126739834ac..3f7aef947633 100644
--- a/arch/powerpc/platforms/celleb/scc_epci.c
+++ b/arch/powerpc/platforms/celleb/scc_epci.c
@@ -35,7 +35,7 @@
 #include <asm/ppc-pci.h>
 
 #include "scc.h"
-#include "pci.h"
+#include "../cell/celleb_pci.h"
 #include "interrupt.h"
 
 #define MAX_PCI_DEVICES   32