1 files changed, 10 insertions, 15 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 6aad99ec4e0f..3141dd3b6e53 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -201,19 +201,6 @@ config DIGIEPCA
           To compile this driver as a module, choose M here: the
           module will be called epca.
 
-config ESPSERIAL
-        tristate "Hayes ESP serial port support"
-        depends on SERIAL_NONSTANDARD && ISA && ISA_DMA_API && BROKEN
-        help
-          This is a driver which supports Hayes ESP serial ports.  Both single
-          port cards and multiport cards are supported.  Make sure to read
-          <file:Documentation/hayes-esp.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called esp.
-
-          If unsure, say N.
-
 config MOXA_INTELLIO
         tristate "Moxa Intellio support"
         depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
@@ -515,7 +502,7 @@ config BRIQ_PANEL
 
 config BFIN_OTP
         tristate "Blackfin On-Chip OTP Memory Support"
-        depends on BLACKFIN && (BF52x || BF54x)
+        depends on BLACKFIN && (BF51x || BF52x || BF54x)
         default y
         help
           If you say Y here, you will get support for a character device
@@ -679,10 +666,18 @@ config VIRTIO_CONSOLE
         help
           Virtio console for use with lguest and other hypervisors.
 
+          Also serves as a general-purpose serial device for data
+          transfer between the guest and host.  Character devices at
+          /dev/vportNpn will be created when corresponding ports are
+          found, where N is the device number and n is the port number
+          within that device.  If specified by the host, a sysfs
+          attribute called 'name' will be populated with a name for
+          the port which can be used by udev scripts to create a
+          symlink to the device.
 
 config HVCS
         tristate "IBM Hypervisor Virtual Console Server support"
-        depends on PPC_PSERIES
+        depends on PPC_PSERIES && HVC_CONSOLE
         help
           Partitionable IBM Power5 ppc64 machines allow hosting of
           firmware virtual consoles from one Linux partition by