Lguest support for Virtio

[linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 57b801716fbe3229a3f8572f6880bacd24ed0d65..bf18d757b87641e2413ab712626f6c0e55b6c7ff 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -36,23 +36,6 @@ config VT
          If unsure, say Y, or else you won't be able to do much with your new
          shiny Linux system :-)
 
-config VT_UNICODE
-       bool "Virtual console is Unicode by default"
-       depends on VT
-       default n
-       ---help---
-         If you say Y here, the virtual terminal will be in UTF-8 by default,
-         and the keyboard will run in unicode mode.
-
-         If you say N here, the virtual terminal will not be in UTF-8 by
-         default, and the keyboard will run in XLATE mode.
-
-         This can also be changed by passing 'default_utf8=<0|1>' on the
-         kernel command line.
-
-         Historically, the kernel has defaulted to non-UTF8 and XLATE mode.
-         If unsure, say N here.
-
 config VT_CONSOLE
        bool "Support for console on virtual terminal" if EMBEDDED
        depends on VT
@@ -586,7 +569,7 @@ config HVC_DRIVER
        bool
        help
          Generic "hypervisor virtual console" infrastructure for various
-         hypervisors (pSeries, Xen, lguest).
+         hypervisors (pSeries, iSeries, Xen, lguest).
          It will automatically be selected if one of the back-end console drivers
          is selected.
 
@@ -630,6 +613,10 @@ config HVC_XEN
        help
          Xen virtual console device driver
 
+config VIRTIO_CONSOLE
+       bool
+       select HVC_DRIVER
+
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES
@@ -649,8 +636,6 @@ config HVCS
 
 source "drivers/char/ipmi/Kconfig"
 
-source "drivers/char/watchdog/Kconfig"
-
 config DS1620
        tristate "NetWinder thermometer support"
        depends on ARCH_NETWINDER