Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

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

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 16e4e401b8203f1668dd83c0c0ee0d1bfb8b54d5..07fe5b69b9e25f8c1c930c18a28a29920e525c89 100644 (file)
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -21,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
@@ -34,3 +34,8 @@ config LPARCFG
        help
        Provide system capacity information via human readable
        <key word>=<value> pairs through a /proc/ppc64/lparcfg interface.
+
+config PPC_PSERIES_DEBUG
+       depends on PPC_PSERIES && PPC_EARLY_DEBUG
+       bool "Enable extra debug logging in platforms/pseries"
+       default y