[POWERPC] disallow building powermac and tsi108 without PCI

The TSI108 code and the 32 bit powermac and chrp platforms
have dependency on PCI that is not easy or desirable to get rid
of.

The easiest fix is to always select CONFIG_PCI if one of those
platforms is enabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 29012204c295edbd7c9f2fead4e5ba7e341a1d63..7c1bae5c220418516ff3c8cba3c924411d60e5ce 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -430,7 +430,7 @@ config MCA
 config PCI
        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-               || MPC7448HPC2 || PPC_PS3 || PPC_HOLLY
+               || PPC_PS3
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx

diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig
index d2c690531963597363aa8cc6af42a5eee2121b66..22b4b4e3b6f020e6e1625980f92dcd7c97cc7133 100644 (file)
--- a/arch/powerpc/platforms/chrp/Kconfig
+++ b/arch/powerpc/platforms/chrp/Kconfig
@@ -8,4 +8,5 @@ config PPC_CHRP
        select PPC_MPC106
        select PPC_UDBG_16550
        select PPC_NATIVE
+       select PCI
        default y

diff --git a/arch/powerpc/platforms/chrp/Makefile b/arch/powerpc/platforms/chrp/Makefile
index 902feb1ac4319de74bfe9cf75643efcd5871b7f9..4b3bfadc70fa408eb9f21a07ac63734924573ac0 100644 (file)
--- a/arch/powerpc/platforms/chrp/Makefile
+++ b/arch/powerpc/platforms/chrp/Makefile
@@ -1,4 +1,3 @@
-obj-y                          += setup.o time.o pegasos_eth.o
-obj-$(CONFIG_PCI)              += pci.o
+obj-y                          += setup.o time.o pegasos_eth.o pci.o
 obj-$(CONFIG_SMP)              += smp.o
 obj-$(CONFIG_NVRAM)            += nvram.o

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 91a1652cb9178cef3244a6b0f8a8b2edd0116912..bec772674e4066db350f22b77d77bf74c5b32134 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -45,6 +45,7 @@ endchoice
 config TSI108_BRIDGE
        bool
        depends on MPC7448HPC2 || PPC_HOLLY
+       select PCI
        select MPIC
        select MPIC_WEIRD
        default y

diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 5b7afe50039a84be6fc7e12c019833cf36acd4dc..055990ca8ce6cb989d43c384fb3ca1c17502bed6 100644 (file)
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -2,6 +2,7 @@ config PPC_PMAC
        bool "Apple PowerMac based machines"
        depends on PPC_MULTIPLATFORM
        select MPIC
+       select PCI
        select PPC_INDIRECT_PCI if PPC32
        select PPC_MPC106 if PPC32
        select PPC_NATIVE