diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 7710d2e08037..55e094b96bc0 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1 +1,2 @@
+obj-y			+= interrupt.o iommu.o setup.o spider-pic.o
 obj-$(CONFIG_SMP)	+= smp.o
diff --git a/arch/ppc64/kernel/bpa_iic.c b/arch/powerpc/platforms/cell/interrupt.c
similarity index 100%
rename from arch/ppc64/kernel/bpa_iic.c
rename to arch/powerpc/platforms/cell/interrupt.c
diff --git a/arch/ppc64/kernel/bpa_iic.h b/arch/powerpc/platforms/cell/interrupt.h
similarity index 100%
rename from arch/ppc64/kernel/bpa_iic.h
rename to arch/powerpc/platforms/cell/interrupt.h
diff --git a/arch/ppc64/kernel/bpa_iommu.c b/arch/powerpc/platforms/cell/iommu.c
similarity index 100%
rename from arch/ppc64/kernel/bpa_iommu.c
rename to arch/powerpc/platforms/cell/iommu.c
diff --git a/arch/ppc64/kernel/bpa_iommu.h b/arch/powerpc/platforms/cell/iommu.h
similarity index 100%
rename from arch/ppc64/kernel/bpa_iommu.h
rename to arch/powerpc/platforms/cell/iommu.h
diff --git a/arch/ppc64/kernel/bpa_setup.c b/arch/powerpc/platforms/cell/setup.c
similarity index 100%
rename from arch/ppc64/kernel/bpa_setup.c
rename to arch/powerpc/platforms/cell/setup.c
diff --git a/arch/ppc64/kernel/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
similarity index 100%
rename from arch/ppc64/kernel/spider-pic.c
rename to arch/powerpc/platforms/cell/spider-pic.c
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index afd445114446..247d2fc6a8ed 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -31,9 +31,6 @@ endif
 
 obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o
 
-obj-$(CONFIG_PPC_CELL) += bpa_setup.o bpa_iommu.o \
-			 bpa_iic.o spider-pic.o
-
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o
 obj-$(CONFIG_EEH)		+= eeh.o
 obj-$(CONFIG_PROC_FS)		+= proc_ppc64.o