diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-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 |
5 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 29012204c295..7c1bae5c2204 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -430,7 +430,7 @@ config MCA | |||
430 | config PCI | 430 | config PCI |
431 | bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \ | 431 | bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \ |
432 | || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \ | 432 | || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \ |
433 | || MPC7448HPC2 || PPC_PS3 || PPC_HOLLY | 433 | || PPC_PS3 |
434 | default y if !40x && !CPM2 && !8xx && !PPC_83xx \ | 434 | default y if !40x && !CPM2 && !8xx && !PPC_83xx \ |
435 | && !PPC_85xx && !PPC_86xx | 435 | && !PPC_85xx && !PPC_86xx |
436 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx | 436 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx |
diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig index d2c690531963..22b4b4e3b6f0 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 902feb1ac431..4b3bfadc70fa 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 91a1652cb917..bec772674e40 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 5b7afe50039a..055990ca8ce6 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 |