1 files changed, 19 insertions, 10 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2643dbc3f289..4d4b6fb156e1 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -354,6 +354,7 @@ endchoice
 config PPC_PSERIES
         depends on PPC_MULTIPLATFORM && PPC64
         bool "IBM pSeries & new (POWER5-based) iSeries"
+        select MPIC
         select PPC_I8259
         select PPC_RTAS
         select RTAS_ERROR_LOGGING
@@ -363,6 +364,7 @@ config PPC_PSERIES
 config PPC_CHRP
         bool "Common Hardware Reference Platform (CHRP) based machines"
         depends on PPC_MULTIPLATFORM && PPC32
+        select MPIC
         select PPC_I8259
         select PPC_INDIRECT_PCI
         select PPC_RTAS
@@ -373,6 +375,7 @@ config PPC_CHRP
 config PPC_PMAC
         bool "Apple PowerMac based machines"
         depends on PPC_MULTIPLATFORM
+        select MPIC
         select PPC_INDIRECT_PCI if PPC32
         select PPC_MPC106 if PPC32
         default y
@@ -380,6 +383,7 @@ config PPC_PMAC
 config PPC_PMAC64
         bool
         depends on PPC_PMAC && POWER4
+        select MPIC
         select U3_DART
         select MPIC_BROKEN_U3
         select GENERIC_TBSYNC
@@ -389,6 +393,7 @@ config PPC_PMAC64
 config PPC_PREP
         bool "PowerPC Reference Platform (PReP) based machines"
         depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
+        select MPIC
         select PPC_I8259
         select PPC_INDIRECT_PCI
         select PPC_UDBG_16550
@@ -397,6 +402,7 @@ config PPC_PREP
 config PPC_MAPLE
         depends on PPC_MULTIPLATFORM && PPC64
         bool "Maple 970FX Evaluation Board"
+        select MPIC
         select U3_DART
         select MPIC_BROKEN_U3
         select GENERIC_TBSYNC
@@ -439,12 +445,6 @@ config U3_DART
         depends on PPC_MULTIPLATFORM && PPC64
         default n
 
-config MPIC
-        depends on PPC_PSERIES || PPC_PMAC || PPC_MAPLE || PPC_CHRP \
-                               || MPC7448HPC2
-        bool
-        default y
-
 config PPC_RTAS
         bool
         default n
@@ -504,7 +504,7 @@ config CPU_FREQ_PMAC
 
 config CPU_FREQ_PMAC64
         bool "Support for some Apple G5s"
-        depends on CPU_FREQ && PMAC_SMU && PPC64
+        depends on CPU_FREQ && PPC64
         select CPU_FREQ_TABLE
         help
           This adds support for frequency switching on Apple iMac G5,
@@ -812,6 +812,14 @@ config GENERIC_ISA_DMA
         depends on PPC64 || POWER4 || 6xx && !CPM2
         default y
 
+config MPIC
+        bool
+        default n
+
+config MPIC_WEIRD
+        bool
+        default n
+
 config PPC_I8259
         bool
         default n
@@ -836,9 +844,10 @@ config MCA
         bool
 
 config PCI
-        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) \
-                                  || MPC7448HPC2
-        default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !PPC_85xx && !PPC_86xx
+        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
+                || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2
+        default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
+                && !PPC_85xx && !PPC_86xx
         default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
         help