diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2007-06-17 19:06:58 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 02:57:00 -0400 |
| commit | d3c7ffabf0ce31026b2e43490ff694d70c0fbd3a (patch) | |
| tree | ef06cf5c9b5d374d97547d14f3a78625a26e75ce /arch/powerpc/platforms | |
| parent | d66584086717f6dda76d523ef58363deaa3efe51 (diff) | |
[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>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/chrp/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/chrp/Makefile | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powermac/Kconfig | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig index d2c69053196..22b4b4e3b6f 100644 --- a/arch/powerpc/platforms/chrp/Kconfig +++ b/arch/powerpc/platforms/chrp/Kconfig | |||
| @@ -8,4 +8,5 @@ config PPC_CHRP | |||
| 8 | select PPC_MPC106 | 8 | select PPC_MPC106 |
| 9 | select PPC_UDBG_16550 | 9 | select PPC_UDBG_16550 |
| 10 | select PPC_NATIVE | 10 | select PPC_NATIVE |
| 11 | select PCI | ||
| 11 | default y | 12 | default y |
diff --git a/arch/powerpc/platforms/chrp/Makefile b/arch/powerpc/platforms/chrp/Makefile index 902feb1ac43..4b3bfadc70f 100644 --- a/arch/powerpc/platforms/chrp/Makefile +++ b/arch/powerpc/platforms/chrp/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | obj-y += setup.o time.o pegasos_eth.o | 1 | obj-y += setup.o time.o pegasos_eth.o pci.o |
| 2 | obj-$(CONFIG_PCI) += pci.o | ||
| 3 | obj-$(CONFIG_SMP) += smp.o | 2 | obj-$(CONFIG_SMP) += smp.o |
| 4 | obj-$(CONFIG_NVRAM) += nvram.o | 3 | obj-$(CONFIG_NVRAM) += nvram.o |
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig index 91a1652cb91..bec772674e4 100644 --- a/arch/powerpc/platforms/embedded6xx/Kconfig +++ b/arch/powerpc/platforms/embedded6xx/Kconfig | |||
| @@ -45,6 +45,7 @@ endchoice | |||
| 45 | config TSI108_BRIDGE | 45 | config TSI108_BRIDGE |
| 46 | bool | 46 | bool |
| 47 | depends on MPC7448HPC2 || PPC_HOLLY | 47 | depends on MPC7448HPC2 || PPC_HOLLY |
| 48 | select PCI | ||
| 48 | select MPIC | 49 | select MPIC |
| 49 | select MPIC_WEIRD | 50 | select MPIC_WEIRD |
| 50 | default y | 51 | default y |
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig index 5b7afe50039..055990ca8ce 100644 --- a/arch/powerpc/platforms/powermac/Kconfig +++ b/arch/powerpc/platforms/powermac/Kconfig | |||
| @@ -2,6 +2,7 @@ config PPC_PMAC | |||
| 2 | bool "Apple PowerMac based machines" | 2 | bool "Apple PowerMac based machines" |
| 3 | depends on PPC_MULTIPLATFORM | 3 | depends on PPC_MULTIPLATFORM |
| 4 | select MPIC | 4 | select MPIC |
| 5 | select PCI | ||
| 5 | select PPC_INDIRECT_PCI if PPC32 | 6 | select PPC_INDIRECT_PCI if PPC32 |
| 6 | select PPC_MPC106 if PPC32 | 7 | select PPC_MPC106 if PPC32 |
| 7 | select PPC_NATIVE | 8 | select PPC_NATIVE |