Merge branch 'fixes-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / iseries / Kconfig

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 46c3a8e7c3a8a0a5b035991c9a34921423af8eca..761d9e971fc4bacb5413efc9dd4b02cb3da4bd8c 100644 (file)
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -7,7 +7,9 @@ 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