diff options
-rw-r--r-- | arch/powerpc/platforms/iseries/Kconfig | 4 | ||||
-rw-r--r-- | drivers/char/Kconfig | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig index 46c3a8e7c3a8..761d9e971fc4 100644 --- a/arch/powerpc/platforms/iseries/Kconfig +++ b/arch/powerpc/platforms/iseries/Kconfig | |||
@@ -7,7 +7,9 @@ menu "iSeries device drivers" | |||
7 | depends on PPC_ISERIES | 7 | depends on PPC_ISERIES |
8 | 8 | ||
9 | config VIOCONS | 9 | config VIOCONS |
10 | tristate "iSeries Virtual Console Support (Obsolete)" | 10 | bool "iSeries Virtual Console Support (Obsolete)" |
11 | depends on !HVC_ISERIES | ||
12 | default n | ||
11 | help | 13 | help |
12 | This is the old virtual console driver for legacy iSeries. | 14 | This is the old virtual console driver for legacy iSeries. |
13 | You should use the iSeries Hypervisor Virtual Console | 15 | You should use the iSeries Hypervisor Virtual Console |
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 1e32fb834eb8..2df42fdcdc91 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -631,7 +631,8 @@ config HVC_CONSOLE | |||
631 | 631 | ||
632 | config HVC_ISERIES | 632 | config HVC_ISERIES |
633 | bool "iSeries Hypervisor Virtual Console support" | 633 | bool "iSeries Hypervisor Virtual Console support" |
634 | depends on PPC_ISERIES && !VIOCONS | 634 | depends on PPC_ISERIES |
635 | default y | ||
635 | select HVC_DRIVER | 636 | select HVC_DRIVER |
636 | help | 637 | help |
637 | iSeries machines support a hypervisor virtual console. | 638 | iSeries machines support a hypervisor virtual console. |