[PATCH] fix viocons allyesconfig #error

[PATCH] fix viocons allyesconfig #error

[Dave Hansen]

make allyesconfig bombs out, and probably has for years.

This should fix it in the right way.  The #error in a .c
file is a wee bit of a hack, and Kconfig should be a bit
more refined.

Signed-off-by: Dave Hansen <hansendc@us.ibm.com>
---


diff -puN arch/powerpc/platforms/iseries/Kconfig~viocons-allyesconfig-fix arch/powerpc/platforms/iseries/Kconfig
--- lxc/arch/powerpc/platforms/iseries/Kconfig~viocons-allyesconfig-fix	2007-03-15 08:52:51.000000000 -0700
+++ lxc-dave/arch/powerpc/platforms/iseries/Kconfig	2007-03-15 08:52:51.000000000 -0700
@@ -4,11 +4,15 @@ menu "iSeries device drivers"
 
 config VIOCONS
 	tristate "iSeries Virtual Console Support (Obsolete)"
+	depends on !VT
 	help
 	  This is the old virtual console driver for legacy iSeries.
 	  You should use the iSeries Hypervisor Virtual Console
 	  support instead.
 
+comment "iSeries Virtual Console Support requires disabling VT"
+	depends on VT
+
 config VIODASD
 	tristate "iSeries Virtual I/O disk support"
 	help
diff -puN drivers/char/viocons.c~viocons-allyesconfig-fix drivers/char/viocons.c
--- lxc/drivers/char/viocons.c~viocons-allyesconfig-fix	2007-03-15 08:52:51.000000000 -0700
+++ lxc-dave/drivers/char/viocons.c	2007-03-15 08:52:51.000000000 -0700
@@ -49,10 +49,6 @@
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call.h>
 
-#ifdef CONFIG_VT
-#error You must turn off CONFIG_VT to use CONFIG_VIOCONS
-#endif
-
 #define VIOTTY_MAGIC (0x0DCB)
 #define VTTY_PORTS 10
 
_