Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[linux-2.6] / arch / powerpc / platforms / pseries / Kconfig

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 4e5c8f8..306a9d0 100644 (file)
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -1,3 +1,13 @@
+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
+       select PPC_UDBG_16550
+       select PPC_NATIVE
+       default y
 
 config PPC_SPLPAR
        depends on PPC_PSERIES
@@ -11,7 +21,7 @@ config PPC_SPLPAR
 
 config EEH
        bool "PCI Extended Error Handling (EEH)" if EMBEDDED
-       depends on PPC_PSERIES
+       depends on PPC_PSERIES && PCI
        default y if !EMBEDDED
 
 config SCANLOG
@@ -19,7 +29,7 @@ config SCANLOG
        depends on RTAS_PROC && PPC_PSERIES
 
 config LPARCFG
-       tristate "LPAR Configuration Data"
+       bool "LPAR Configuration Data"
        depends on PPC_PSERIES || PPC_ISERIES
        help
        Provide system capacity information via human readable