1 files changed, 26 insertions, 18 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2d854bb9373e..d0ac944e1696 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -36,6 +36,14 @@ config VT
           If unsure, say Y, or else you won't be able to do much with your new
           shiny Linux system :-)
 
+config CONSOLE_TRANSLATIONS
+        depends on VT
+        default y
+        bool "Enable character translations in console" if EMBEDDED
+        ---help---
+          This enables support for font mapping and Unicode translation
+          on virtual consoles.
+
 config VT_CONSOLE
         bool "Support for console on virtual terminal" if EMBEDDED
         depends on VT
@@ -300,16 +308,6 @@ config SPECIALIX
           and compile this driver as kernel loadable module which will be
           called specialix.
 
-config SPECIALIX_RTSCTS
-        bool "Specialix DTR/RTS pin is RTS"
-        depends on SPECIALIX
-        help
-          The Specialix IO8+ card can only support either RTS or DTR. If you
-          say N here, the driver will use the pin as "DTR" when the tty is in
-          software handshake mode.  If you say Y here or hardware handshake is
-          on, it will always be RTS.  Read the file
-          <file:Documentation/specialix.txt> for more information.
-
 config SX
         tristate "Specialix SX (and SI) card support"
         depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
@@ -588,11 +586,14 @@ config HVC_DRIVER
           It will automatically be selected if one of the back-end console drivers
           is selected.
 
+config HVC_IRQ
+        bool
 
 config HVC_CONSOLE
         bool "pSeries Hypervisor Virtual Console support"
         depends on PPC_PSERIES
         select HVC_DRIVER
+        select HVC_IRQ
         help
           pSeries machines when partitioned support a hypervisor virtual
           console. This driver allows each pSeries partition to have a console
@@ -603,6 +604,7 @@ config HVC_ISERIES
         depends on PPC_ISERIES
         default y
         select HVC_DRIVER
+        select HVC_IRQ
         help
           iSeries machines support a hypervisor virtual console.
 
@@ -624,13 +626,18 @@ config HVC_XEN
         bool "Xen Hypervisor Console support"
         depends on XEN
         select HVC_DRIVER
+        select HVC_IRQ
         default y
         help
           Xen virtual console device driver
 
 config VIRTIO_CONSOLE
-        bool
+        tristate "Virtio console"
+        depends on VIRTIO
         select HVC_DRIVER
+        help
+          Virtio console for use with lguest and other hypervisors.
+
 
 config HVCS
         tristate "IBM Hypervisor Virtual Console Server support"
@@ -649,6 +656,14 @@ config HVCS
           which will also be compiled when this driver is built as a
           module.
 
+config IBM_BSR
+        tristate "IBM POWER Barrier Synchronization Register support"
+        depends on PPC_PSERIES
+        help
+          This devices exposes a hardware mechanism for fast synchronization
+          of threads across a large system which avoids bouncing a cacheline
+          between several cores on a system
+
 source "drivers/char/ipmi/Kconfig"
 
 config DS1620
@@ -859,13 +874,6 @@ config DS1302
 
 endif # RTC_LIB
 
-config COBALT_LCD
-        bool "Support for Cobalt LCD"
-        depends on MIPS_COBALT
-        help
-          This option enables support for the LCD display and buttons found
-          on Cobalt systems through a misc device.
-
 config DTLK
         tristate "Double Talk PC internal speech card support"
         depends on ISA