Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6-omap-h63xx.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b391776e5bf31ca24f45eea0576e63364c2c2c80..466629594776fc4af443dec3ca4dc0fa767d0c4e 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -137,7 +137,7 @@ config CYCLADES
          your Linux box, for instance in order to become a dial-in server.
 
          For information about the Cyclades-Z card, read
-         <file:drivers/char/README.cycladesZ>.
+         <file:Documentation/README.cycladesZ>.
 
          To compile this driver as a module, choose M here: the
          module will be called cyclades.
@@ -373,6 +373,16 @@ config ISTALLION
          To compile this driver as a module, choose M here: the
          module will be called istallion.
 
+config NOZOMI
+       tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
+       depends on PCI && EXPERIMENTAL
+       help
+         If you have a HSDPA driver Broadband Wireless Data Card -
+         Globe Trotter PCMCIA card, say Y here.
+
+         To compile this driver as a module, choose M here, the module
+         will be called nozomi.
+
 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP
@@ -457,7 +467,7 @@ config LEGACY_PTYS
 config LEGACY_PTY_COUNT
        int "Maximum number of legacy PTY in use"
        depends on LEGACY_PTYS
-       range 1 256
+       range 0 256
        default "256"
        ---help---
          The maximum number of legacy PTYs that can be used at any one time.
@@ -543,33 +553,11 @@ config PPDEV
 
          If unsure, say N.
 
-config TIPAR
-       tristate "Texas Instruments parallel link cable support"
-       depends on PARPORT
-       ---help---
-         If you own a Texas Instruments graphing calculator and use a
-         parallel link cable, then you might be interested in this driver.
-
-         If you enable this driver, you will be able to communicate with
-         your calculator through a set of device nodes under /dev. The
-         main advantage of this driver is that you don't have to be root
-         to use this precise link cable (depending on the permissions on
-         the device nodes, though).
-
-         To compile this driver as a module, choose M here: the
-         module will be called tipar.
-
-         If you don't know what a parallel link cable is or what a Texas
-         Instruments graphing calculator is, then you probably don't need this
-         driver.
-
-         If unsure, say N.
-
 config HVC_DRIVER
        bool
        help
-         Users of pSeries machines that want to utilize the hvc console front-end
-         module for their backend console driver should select this option.
+         Generic "hypervisor virtual console" infrastructure for various
+         hypervisors (pSeries, iSeries, Xen, lguest).
          It will automatically be selected if one of the back-end console drivers
          is selected.
 
@@ -613,6 +601,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
@@ -632,8 +624,6 @@ config HVCS
 
 source "drivers/char/ipmi/Kconfig"
 
-source "drivers/char/watchdog/Kconfig"
-
 config DS1620
        tristate "NetWinder thermometer support"
        depends on ARCH_NETWINDER
@@ -896,10 +886,6 @@ config GPIO_TB0219
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 
-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
-
 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE