浏览代码

[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>
Stephen Rothwell 18 年之前
父节点
当前提交
b15f792faf
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 3 1
      arch/powerpc/platforms/iseries/Kconfig
  2. 2 1
      drivers/char/Kconfig

+ 3 - 1
arch/powerpc/platforms/iseries/Kconfig

@@ -7,7 +7,9 @@ menu "iSeries device drivers"
 	depends on PPC_ISERIES
 	depends on PPC_ISERIES
 
 
 config VIOCONS
 config VIOCONS
-	tristate "iSeries Virtual Console Support (Obsolete)"
+	bool "iSeries Virtual Console Support (Obsolete)"
+	depends on !HVC_ISERIES
+	default n
 	help
 	help
 	  This is the old virtual console driver for legacy iSeries.
 	  This is the old virtual console driver for legacy iSeries.
 	  You should use the iSeries Hypervisor Virtual Console
 	  You should use the iSeries Hypervisor Virtual Console

+ 2 - 1
drivers/char/Kconfig

@@ -631,7 +631,8 @@ config HVC_CONSOLE
 
 
 config HVC_ISERIES
 config HVC_ISERIES
 	bool "iSeries Hypervisor Virtual Console support"
 	bool "iSeries Hypervisor Virtual Console support"
-	depends on PPC_ISERIES && !VIOCONS
+	depends on PPC_ISERIES
+	default y
 	select HVC_DRIVER
 	select HVC_DRIVER
 	help
 	help
 	  iSeries machines support a hypervisor virtual console.
 	  iSeries machines support a hypervisor virtual console.