diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 853c282da22eadb59032f50983295d48f28f90e0..3ff90f096bff337e88d2485d95854ec5740aaaf7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -425,6 +425,10 @@ config SBUS
 config FSL_SOC
 	bool
 
+config FSL_PCI
+ 	bool
+	select PPC_INDIRECT_PCI
+
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
 	bool
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 0faebfdc1596978fc55e7e565288fbadf767ed34..d1c8115200bc203d4f110024ca62e0bc805df79b 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -14,8 +14,8 @@ endchoice
 
 config MPC8641
 	bool
-	select PPC_INDIRECT_PCI
-	select PPC_INDIRECT_PCI_BE
+	select PPC_INDIRECT_PCI_BE if PCI
+	select FSL_PCI if PCI
 	select PPC_UDBG_16550
 	select MPIC
 	default y if MPC8641_HPCN
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 418fd8f4d26805b37e05ecd02d70f10eb03d5764..3376c7767f2d128510708996acb050241b86e596 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -4,4 +4,3 @@
 
 obj-$(CONFIG_SMP)		+= mpc86xx_smp.o
 obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o
-obj-$(CONFIG_PCI)		+= pci.o
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 484eb4e0e9dbd16c86cf39024ef052c10b785fed..08ce31e612c202c13d20c6820774df7d4cbe53c4 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_PPC_PMI)		+= pmi.o
 obj-$(CONFIG_U3_DART)		+= dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
 obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
+obj-$(CONFIG_FSL_PCI)		+= fsl_pci.o
 obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
 mv64x60-$(CONFIG_PCI)		+= mv64x60_pci.o
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/sysdev/fsl_pci.c
similarity index 99%
rename from arch/powerpc/platforms/86xx/pci.c
rename to arch/powerpc/sysdev/fsl_pci.c
index 73cd5b05a84eb49b92270fbeaa71168671fc64fa..24ba1b6b31fb0e132c1129e8a9694fbd60cf1b13 100644
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -24,9 +24,9 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <sysdev/fsl_soc.h>
-#include <sysdev/fsl_pcie.h>
+#include <sysdev/fsl_pci.h>
 
-#include "mpc86xx.h"
+#include "../platforms/86xx/mpc86xx.h"
 
 #undef DEBUG
 
diff --git a/arch/powerpc/sysdev/fsl_pcie.h b/arch/powerpc/sysdev/fsl_pci.h
similarity index 100%
rename from arch/powerpc/sysdev/fsl_pcie.h
rename to arch/powerpc/sysdev/fsl_pci.h