Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / platforms / pseries / Kconfig

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 3139814f643985e1879ed876b651a7f1e2a370a7..5b3da4b4ea79c4d235969c4e3b7f6ec54e2b28a6 100644 (file)
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -10,7 +10,7 @@ config PPC_PSERIES
        select RTAS_ERROR_LOGGING
        select PPC_UDBG_16550
        select PPC_NATIVE
-       select PPC_PCI_CHOICE if EMBEDDED
+       select PPC_PCI_CHOICE if EXPERT
        default y
 
 config PPC_SPLPAR
@@ -24,15 +24,25 @@ config PPC_SPLPAR
          two or more partitions.
 
 config EEH
-       bool "PCI Extended Error Handling (EEH)" if EMBEDDED
+       bool "PCI Extended Error Handling (EEH)" if EXPERT
        depends on PPC_PSERIES && PCI
-       default y if !EMBEDDED
+       default y if !EXPERT
 
 config PSERIES_MSI
        bool
        depends on PCI_MSI && EEH
        default y
 
+config PSERIES_ENERGY
+       tristate "pSeries energy management capabilities driver"
+       depends on PPC_PSERIES
+       default y
+       help
+         Provides interface to platform energy management capabilities
+         on supported PSERIES platforms.
+         Provides: /sys/devices/system/cpu/pseries_(de)activation_hint_list
+         and /sys/devices/system/cpu/cpuN/pseries_(de)activation_hint
+
 config SCANLOG
        tristate "Scanlog dump interface"
        depends on RTAS_PROC && PPC_PSERIES