[POWERPC] iSeries: Make HVC_ISERIES the default

This makes the new iSeries virtual console drivers (nvc_iseries) the
default and prevents viocons being built unless explicitly selected.
Also it makes no sense to have the console as a module.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

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"
         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
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
 
 config HVC_ISERIES
         bool "iSeries Hypervisor Virtual Console support"
-        depends on PPC_ISERIES && !VIOCONS
+        depends on PPC_ISERIES
+        default y
         select HVC_DRIVER
         help
           iSeries machines support a hypervisor virtual console.