Pull thermal into release branch

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / iseries / Kconfig

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 887b68804e6d6dbd41d5a286c941d2be796d3038..761d9e971fc4bacb5413efc9dd4b02cb3da4bd8c 100644 (file)
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -1,9 +1,15 @@
+config PPC_ISERIES
+       bool "IBM Legacy iSeries"
+       depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_INDIRECT_IO
 
 menu "iSeries device drivers"
        depends on PPC_ISERIES
 
 config VIOCONS
-       tristate "iSeries Virtual Console Support (Obsolete)"
+       bool "iSeries Virtual Console Support (Obsolete)"
+       depends on !HVC_ISERIES
+       default n
        help
          This is the old virtual console driver for legacy iSeries.
          You should use the iSeries Hypervisor Virtual Console
@@ -31,5 +37,5 @@ endmenu
 
 config VIOPATH
        bool
-       depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH
+       depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
        default y