1 files changed, 2 insertions, 538 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b7980a83ce2d..04f8b2d083c6 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -4,89 +4,7 @@
 menu "Character devices"
-config VT
+source "drivers/tty/Kconfig"
-        bool "Virtual terminal" if EXPERT
-        depends on !S390
-        select INPUT
-        default y
-        ---help---
-          If you say Y here, you will get support for terminal devices with
-          display and keyboard devices. These are called "virtual" because you
-          can run several virtual terminals (also called virtual consoles) on
-          one physical terminal. This is rather useful, for example one
-          virtual terminal can collect system messages and warnings, another
-          one can be used for a text-mode user session, and a third could run
-          an X session, all in parallel. Switching between virtual terminals
-          is done with certain key combinations, usually Alt-<function key>.
-          The setterm command ("man setterm") can be used to change the
-          properties (such as colors or beeping) of a virtual terminal. The
-          man page console_codes(4) ("man console_codes") contains the special
-          character sequences that can be used to change those properties
-          directly. The fonts used on virtual terminals can be changed with
-          the setfont ("man setfont") command and the key bindings are defined
-          with the loadkeys ("man loadkeys") command.
-          You need at least one virtual terminal device in order to make use
-          of your keyboard and monitor. Therefore, only people configuring an
-          embedded system would want to say N here in order to save some
-          memory; the only way to log into such a system is then via a serial
-          or network connection.
-          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 EXPERT
-        ---help---
-          This enables support for font mapping and Unicode translation
-          on virtual consoles.
-config VT_CONSOLE
-        bool "Support for console on virtual terminal" if EXPERT
-        depends on VT
-        default y
-        ---help---
-          The system console is the device which receives all kernel messages
-          and warnings and which allows logins in single user mode. If you
-          answer Y here, a virtual terminal (the device used to interact with
-          a physical terminal) can be used as system console. This is the most
-          common mode of operations, so you should say Y here unless you want
-          the kernel messages be output only to a serial port (in which case
-          you should say Y to "Console on serial port", below).
-          If you do say Y here, by default the currently visible virtual
-          terminal (/dev/tty0) will be used as system console. You can change
-          that with a kernel command line option such as "console=tty3" which
-          would use the third virtual terminal as system console. (Try "man
-          bootparam" or see the documentation of your boot loader (lilo or
-          loadlin) about how to pass options to the kernel at boot time.)
-          If unsure, say Y.
-config HW_CONSOLE
-        bool
-        depends on VT && !S390 && !UML
-        default y
-config VT_HW_CONSOLE_BINDING
-       bool "Support for binding and unbinding console drivers"
-       depends on HW_CONSOLE
-       default n
-       ---help---
-         The virtual terminal is the device that interacts with the physical
-         terminal through console drivers. On these systems, at least one
-         console driver is loaded. In other configurations, additional console
-         drivers may be enabled, such as the framebuffer console. If more than
-         1 console driver is enabled, setting this to 'y' will allow you to
-         select the console driver that will serve as the backend for the
-         virtual terminals.
-         See <file:Documentation/console/console.txt> for more
-         information. For framebuffer console users, please refer to
-         <file:Documentation/fb/fbcon.txt>.
 config DEVKMEM
        bool "/dev/kmem virtual device support"
@@ -97,253 +15,6 @@ config DEVKMEM
          kind of kernel debugging operations.
          When in doubt, say "N".
-config BFIN_JTAG_COMM
-        tristate "Blackfin JTAG Communication"
-        depends on BLACKFIN
-        help
-          Add support for emulating a TTY device over the Blackfin JTAG.
-          To compile this driver as a module, choose M here: the
-          module will be called bfin_jtag_comm.
-config BFIN_JTAG_COMM_CONSOLE
-        bool "Console on Blackfin JTAG"
-        depends on BFIN_JTAG_COMM=y
-config SERIAL_NONSTANDARD
-        bool "Non-standard serial port support"
-        depends on HAS_IOMEM
-        ---help---
-          Say Y here if you have any non-standard serial boards -- boards
-          which aren't supported using the standard "dumb" serial driver.
-          This includes intelligent serial boards such as Cyclades,
-          Digiboards, etc. These are usually used for systems that need many
-          serial ports because they serve many terminals or dial-in
-          connections.
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about non-standard serial boards.
-          Most people can say N here.
-config COMPUTONE
-        tristate "Computone IntelliPort Plus serial support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        ---help---
-          This driver supports the entire family of Intelliport II/Plus
-          controllers with the exception of the MicroChannel controllers and
-          products previous to the Intelliport II. These are multiport cards,
-          which give you many serial ports. You would need something like this
-          to connect more than two modems to your Linux box, for instance in
-          order to become a dial-in server. If you have a card like that, say
-          Y here and read <file:Documentation/serial/computone.txt>.
-          To compile this driver as module, choose M here: the
-          module will be called ip2.
-config ROCKETPORT
-        tristate "Comtrol RocketPort support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        help
-          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
-          These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
-          modems.  For information about the RocketPort/RocketModem  boards
-          and this driver read <file:Documentation/serial/rocket.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called rocket.
-          If you want to compile this driver into the kernel, say Y here.  If
-          you don't have a Comtrol RocketPort/RocketModem card installed, say N.
-config CYCLADES
-        tristate "Cyclades async mux support"
-        depends on SERIAL_NONSTANDARD && (PCI || ISA)
-        select FW_LOADER
-        ---help---
-          This driver supports Cyclades Z and Y multiserial boards.
-          You would need something like this to connect more than two modems to
-          your Linux box, for instance in order to become a dial-in server.
-          For information about the Cyclades-Z card, read
-          <file:Documentation/serial/README.cycladesZ>.
-          To compile this driver as a module, choose M here: the
-          module will be called cyclades.
-          If you haven't heard about it, it's safe to say N.
-config CYZ_INTR
-        bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && CYCLADES
-        help
-          The Cyclades-Z family of multiport cards allows 2 (two) driver op
-          modes: polling and interrupt. In polling mode, the driver will check
-          the status of the Cyclades-Z ports every certain amount of time
-          (which is called polling cycle and is configurable). In interrupt
-          mode, it will use an interrupt line (IRQ) in order to check the
-          status of the Cyclades-Z ports. The default op mode is polling. If
-          unsure, say N.
-config DIGIEPCA
-        tristate "Digiboard Intelligent Async Support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        ---help---
-          This is a driver for Digi International's Xx, Xeve, and Xem series
-          of cards which provide multiple serial ports. You would need
-          something like this to connect more than two modems to your Linux
-          box, for instance in order to become a dial-in server. This driver
-          supports the original PC (ISA) boards as well as PCI, and EISA. If
-          you have a card like this, say Y here and read the file
-          <file:Documentation/serial/digiepca.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called epca.
-config MOXA_INTELLIO
-        tristate "Moxa Intellio support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        select FW_LOADER
-        help
-          Say Y here if you have a Moxa Intellio multiport serial card.
-          To compile this driver as a module, choose M here: the
-          module will be called moxa.
-config MOXA_SMARTIO
-        tristate "Moxa SmartIO support v. 2.0"
-        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
-        help
-          Say Y here if you have a Moxa SmartIO multiport serial card and/or
-          want to help develop a new version of this driver.
-          This is upgraded (1.9.1) driver from original Moxa drivers with
-          changes finally resulting in PCI probing.
-          This driver can also be built as a module. The module will be called
-          mxser. If you want to do that, say M here.
-config ISI
-        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
-        depends on SERIAL_NONSTANDARD && PCI
-        select FW_LOADER
-        help
-          This is a driver for the Multi-Tech cards which provide several
-          serial ports.  The driver is experimental and can currently only be
-          built as a module. The module will be called isicom.
-          If you want to do that, choose M here.
-config SYNCLINK
-        tristate "Microgate SyncLink card support"
-        depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
-        help
-          Provides support for the SyncLink ISA and PCI multiprotocol serial
-          adapters. These adapters support asynchronous and HDLC bit
-          synchronous communication up to 10Mbps (PCI adapter).
-          This driver can only be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called synclink.  If you want to do that, say M
-          here.
-config SYNCLINKMP
-        tristate "SyncLink Multiport support"
-        depends on SERIAL_NONSTANDARD && PCI
-        help
-          Enable support for the SyncLink Multiport (2 or 4 ports)
-          serial adapter, running asynchronous and HDLC communications up
-          to 2.048Mbps. Each ports is independently selectable for
-          RS-232, V.35, RS-449, RS-530, and X.21
-          This driver may be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called synclinkmp.  If you want to do that, say M
-          here.
-config SYNCLINK_GT
-        tristate "SyncLink GT/AC support"
-        depends on SERIAL_NONSTANDARD && PCI
-        help
-          Support for SyncLink GT and SyncLink AC families of
-          synchronous and asynchronous serial adapters
-          manufactured by Microgate Systems, Ltd. (www.microgate.com)
-config N_HDLC
-        tristate "HDLC line discipline support"
-        depends on SERIAL_NONSTANDARD
-        help
-          Allows synchronous HDLC communications with tty device drivers that
-          support synchronous HDLC such as the Microgate SyncLink adapter.
-          This driver can be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called n_hdlc. If you want to do that, say M
-          here.
-config N_GSM
-        tristate "GSM MUX line discipline support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-        depends on NET
-        help
-          This line discipline provides support for the GSM MUX protocol and
-          presents the mux as a set of 61 individual tty devices.
-config RISCOM8
-        tristate "SDL RISCom/8 card support"
-        depends on SERIAL_NONSTANDARD
-        help
-          This is a driver for the SDL Communications RISCom/8 multiport card,
-          which gives you many serial ports. You would need something like
-          this to connect more than two modems to your Linux box, for instance
-          in order to become a dial-in server. If you have a card like that,
-          say Y here and read the file <file:Documentation/serial/riscom8.txt>.
-          Also it's possible to say M here and compile this driver as kernel
-          loadable module; the module will be called riscom8.
-config SPECIALIX
-        tristate "Specialix IO8+ card support"
-        depends on SERIAL_NONSTANDARD
-        help
-          This is a driver for the Specialix IO8+ multiport card (both the
-          ISA and the PCI version) which gives you many serial ports. You
-          would need something like this to connect more than two modems to
-          your Linux box, for instance in order to become a dial-in server.
-          If you have a card like that, say Y here and read the file
-          <file:Documentation/serial/specialix.txt>. Also it's possible to say
-          M here and compile this driver as kernel loadable module which will be
-          called specialix.
-config SX
-        tristate "Specialix SX (and SI) card support"
-        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
-        help
-          This is a driver for the SX and SI multiport serial cards.
-          Please read the file <file:Documentation/serial/sx.txt> for details.
-          This driver can only be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called sx. If you want to do that, say M here.
-config RIO
-        tristate "Specialix RIO system support"
-        depends on SERIAL_NONSTANDARD && BROKEN
-        help
-          This is a driver for the Specialix RIO, a smart serial card which
-          drives an outboard box that can support up to 128 ports.  Product
-          information is at <http://www.perle.com/support/documentation.html#multiport>.
-          There are both ISA and PCI versions.
-config RIO_OLDPCI
-        bool "Support really old RIO/PCI cards"
-        depends on RIO
-        help
-          Older RIO PCI cards need some initialization-time configuration to
-          determine the IRQ and some control addresses.  If you have a RIO and
-          this doesn't seem to work, try setting this to Y.
 config STALDRV
        bool "Stallion multiport serial support"
        depends on SERIAL_NONSTANDARD
@@ -356,54 +27,6 @@ config STALDRV
          in this case.  If you have never heard about all this, it's safe to
          say N.
-config STALLION
-        tristate "Stallion EasyIO or EC8/32 support"
-        depends on STALDRV && (ISA || EISA || PCI)
-        help
-          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
-          card, then this is for you; say Y.  Make sure to read
-          <file:Documentation/serial/stallion.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called stallion.
-config ISTALLION
-        tristate "Stallion EC8/64, ONboard, Brumby support"
-        depends on STALDRV && (ISA || EISA || PCI)
-        help
-          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
-          serial multiport card, say Y here. Make sure to read
-          <file:Documentation/serial/stallion.txt>.
-          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
-        ---help---
-          This option supports the 2232 7-port serial card shipped with the
-          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
-          a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
-          each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
-          ports were connected with 8 pin DIN connectors on the card bracket,
-          for which 8 pin to DB25 adapters were supplied. The card also had
-          jumpers internally to toggle various pinning configurations.
-          This driver can be built as a module; but then "generic_serial"
-          will also be built as a module. This has to be loaded before
-          "ser_a2232". If you want to do this, answer M here.
 config SGI_SNSC
        bool "SGI Altix system controller communication support"
        depends on (IA64_SGI_SN2 || IA64_GENERIC)
@@ -428,71 +51,6 @@ config SGI_MBCS
 source "drivers/tty/serial/Kconfig"
-config UNIX98_PTYS
-        bool "Unix98 PTY support" if EXPERT
-        default y
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-          Linux has traditionally used the BSD-like names /dev/ptyxx for
-          masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
-          has a number of problems. The GNU C library glibc 2.1 and later,
-          however, supports the Unix98 naming standard: in order to acquire a
-          pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
-          terminal is then made available to the process and the pseudo
-          terminal slave can be accessed as /dev/pts/<number>. What was
-          traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-          All modern Linux systems use the Unix98 ptys.  Say Y unless
-          you're on an embedded system and want to conserve memory.
-config DEVPTS_MULTIPLE_INSTANCES
-        bool "Support multiple instances of devpts"
-        depends on UNIX98_PTYS
-        default n
-        ---help---
-          Enable support for multiple instances of devpts filesystem.
-          If you want to have isolated PTY namespaces (eg: in containers),
-          say Y here.  Otherwise, say N. If enabled, each mount of devpts
-          filesystem with the '-o newinstance' option will create an
-          independent PTY namespace.
-config LEGACY_PTYS
-        bool "Legacy (BSD) PTY support"
-        default y
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-          Linux has traditionally used the BSD-like names /dev/ptyxx
-          for masters and /dev/ttyxx for slaves of pseudo
-          terminals. This scheme has a number of problems, including
-          security.  This option enables these legacy devices; on most
-          systems, it is safe to say N.
-config LEGACY_PTY_COUNT
-        int "Maximum number of legacy PTY in use"
-        depends on LEGACY_PTYS
-        range 0 256
-        default "256"
-        ---help---
-          The maximum number of legacy PTYs that can be used at any one time.
-          The default is 256, and should be more than enough.  Embedded
-          systems may want to reduce this to save memory.
-          When not in use, each legacy PTY occupies 12 bytes on 32-bit
-          architectures and 24 bytes on 64-bit architectures.
 config TTY_PRINTK
        bool "TTY driver to output user messages via printk"
        depends on EXPERT
@@ -612,84 +170,7 @@ config PPDEV
          If unsure, say N.
-config HVC_DRIVER
+source "drivers/tty/hvc/Kconfig"
-        bool
-        help
-          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.
-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
-          which is accessed via the HMC.
-config HVC_ISERIES
-        bool "iSeries Hypervisor Virtual Console support"
-        depends on PPC_ISERIES
-        default y
-        select HVC_DRIVER
-        select HVC_IRQ
-        select VIOPATH
-        help
-          iSeries machines support a hypervisor virtual console.
-config HVC_RTAS
-        bool "IBM RTAS Console support"
-        depends on PPC_RTAS
-        select HVC_DRIVER
-        help
-          IBM Console device driver which makes use of RTAS
-config HVC_BEAT
-        bool "Toshiba's Beat Hypervisor Console support"
-        depends on PPC_CELLEB
-        select HVC_DRIVER
-        help
-          Toshiba's Cell Reference Set Beat Console device driver
-config HVC_IUCV
-        bool "z/VM IUCV Hypervisor console support (VM only)"
-        depends on S390
-        select HVC_DRIVER
-        select IUCV
-        default y
-        help
-          This driver provides a Hypervisor console (HVC) back-end to access
-          a Linux (console) terminal via a z/VM IUCV communication path.
-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 HVC_UDBG
-       bool "udbg based fake hypervisor console"
-       depends on PPC && EXPERIMENTAL
-       select HVC_DRIVER
-       default n
-config HVC_DCC
-       bool "ARM JTAG DCC console"
-       depends on ARM
-       select HVC_DRIVER
-       help
-         This console uses the JTAG DCC on ARM to create a console under the HVC
-         driver. This console is used through a JTAG only on ARM. If you don't have
-         a JTAG then you probably don't want this option.
 config VIRTIO_CONSOLE
        tristate "Virtio console"
@@ -707,23 +188,6 @@ config VIRTIO_CONSOLE
          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 && HVC_CONSOLE
-        help
-          Partitionable IBM Power5 ppc64 machines allow hosting of
-          firmware virtual consoles from one Linux partition by
-          another Linux partition.  This driver allows console data
-          from Linux partitions to be accessed through TTY device
-          interfaces in the device tree of a Linux partition running
-          this driver.
-          To compile this driver as a module, choose M here: the
-          module will be called hvcs.  Additionally, this module
-          will depend on arch specific APIs exported from hvcserver.ko
-          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