33 files changed, 103 insertions, 94 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index bc9271b85759..a85e251c411f 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -554,14 +554,6 @@ config MVME147_SCC
           This is the driver for the serial ports on the Motorola MVME147
           boards.  Everyone using one of these boards should say Y here.
 
-config SERIAL167
-        bool "CD2401 support for MVME166/7 serial ports"
-        depends on MVME16x
-        help
-          This is the driver for the serial ports on the Motorola MVME166,
-          167, and 172 boards.  Everyone using one of these boards should say
-          Y here.
-
 config MVME162_SCC
         bool "SCC support for MVME162 serial ports"
         depends on MVME16x && BROKEN
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 1adfac6a7b0b..7b8cf0295f6c 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -15,63 +15,6 @@ config DEVKMEM
           kind of kernel debugging operations.
           When in doubt, say "N".
 
-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 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 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
@@ -112,28 +55,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 A2232
         tristate "Commodore A2232 serial support (EXPERIMENTAL)"
         depends on EXPERIMENTAL && ZORRO && BROKEN
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index f5dc7c9bce6b..48bb8acbea49 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -8,15 +8,8 @@ obj-y				+= misc.o
 obj-$(CONFIG_MVME147_SCC)       += generic_serial.o vme_scc.o
 obj-$(CONFIG_MVME162_SCC)       += generic_serial.o vme_scc.o
 obj-$(CONFIG_BVME6000_SCC)      += generic_serial.o vme_scc.o
-obj-$(CONFIG_SERIAL167)         += serial167.o
-obj-$(CONFIG_STALLION)          += stallion.o
-obj-$(CONFIG_ISTALLION)         += istallion.o
-obj-$(CONFIG_DIGIEPCA)          += epca.o
-obj-$(CONFIG_SPECIALIX)         += specialix.o
 obj-$(CONFIG_A2232)             += ser_a2232.o generic_serial.o
 obj-$(CONFIG_ATARI_DSP56K)      += dsp56k.o
-obj-$(CONFIG_COMPUTONE)         += ip2/
-obj-$(CONFIG_RISCOM8)           += riscom8.o
 obj-$(CONFIG_SX)                += sx.o generic_serial.o
 obj-$(CONFIG_RIO)               += rio/ generic_serial.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 5c8fcfc42c3e..fb1fc4e5a8cb 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -41,6 +41,8 @@ config STAGING_EXCLUDE_BUILD
 
 if !STAGING_EXCLUDE_BUILD
 
+source "drivers/staging/tty/Kconfig"
+
 source "drivers/staging/et131x/Kconfig"
 
 source "drivers/staging/slicoss/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index d53886317826..f498e345a01d 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -3,6 +3,7 @@
 # fix for build system bug...
 obj-$(CONFIG_STAGING)           += staging.o
 
+obj-y += tty/
 obj-$(CONFIG_ET131X)            += et131x/
 obj-$(CONFIG_SLICOSS)           += slicoss/
 obj-$(CONFIG_VIDEO_GO7007)      += go7007/
diff --git a/drivers/staging/tty/Kconfig b/drivers/staging/tty/Kconfig
new file mode 100644
index 000000000000..77103a07abbd
--- /dev/null
+++ b/drivers/staging/tty/Kconfig
@@ -0,0 +1,87 @@
+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 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 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 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 SERIAL167
+        bool "CD2401 support for MVME166/7 serial ports"
+        depends on MVME16x
+        help
+          This is the driver for the serial ports on the Motorola MVME166,
+          167, and 172 boards.  Everyone using one of these boards should say
+          Y here.
+
diff --git a/drivers/staging/tty/Makefile b/drivers/staging/tty/Makefile
new file mode 100644
index 000000000000..ac57c105611b
--- /dev/null
+++ b/drivers/staging/tty/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_STALLION)          += stallion.o
+obj-$(CONFIG_ISTALLION)         += istallion.o
+obj-$(CONFIG_DIGIEPCA)          += epca.o
+obj-$(CONFIG_SERIAL167)         += serial167.o
+obj-$(CONFIG_SPECIALIX)         += specialix.o
+obj-$(CONFIG_RISCOM8)           += riscom8.o
+obj-$(CONFIG_COMPUTONE)         += ip2/
diff --git a/drivers/staging/tty/TODO b/drivers/staging/tty/TODO
new file mode 100644
index 000000000000..88756453ac6c
--- /dev/null
+++ b/drivers/staging/tty/TODO
@@ -0,0 +1,6 @@
+These are a few tty/serial drivers that either do not build,
+or work if they do build, or if they seem to work, are for obsolete
+hardware, or are full of unfixable races and no one uses them anymore.
+
+If no one steps up to adopt any of these drivers, they will be removed
+in the 2.6.41 release.
diff --git a/drivers/char/epca.c b/drivers/staging/tty/epca.c
index 7ad3638967ae..7ad3638967ae 100644
--- a/drivers/char/epca.c
+++ b/drivers/staging/tty/epca.c
diff --git a/drivers/char/epca.h b/drivers/staging/tty/epca.h
index d414bf2dbf7c..d414bf2dbf7c 100644
--- a/drivers/char/epca.h
+++ b/drivers/staging/tty/epca.h
diff --git a/drivers/char/epcaconfig.h b/drivers/staging/tty/epcaconfig.h
index 55dec067078e..55dec067078e 100644
--- a/drivers/char/epcaconfig.h
+++ b/drivers/staging/tty/epcaconfig.h
diff --git a/drivers/char/ip2/Makefile b/drivers/staging/tty/ip2/Makefile
index 7b78e0dfc5b0..7b78e0dfc5b0 100644
--- a/drivers/char/ip2/Makefile
+++ b/drivers/staging/tty/ip2/Makefile
diff --git a/drivers/char/ip2/i2cmd.c b/drivers/staging/tty/ip2/i2cmd.c
index e7af647800b6..e7af647800b6 100644
--- a/drivers/char/ip2/i2cmd.c
+++ b/drivers/staging/tty/ip2/i2cmd.c
diff --git a/drivers/char/ip2/i2cmd.h b/drivers/staging/tty/ip2/i2cmd.h
index 29277ec6b8ed..29277ec6b8ed 100644
--- a/drivers/char/ip2/i2cmd.h
+++ b/drivers/staging/tty/ip2/i2cmd.h
diff --git a/drivers/char/ip2/i2ellis.c b/drivers/staging/tty/ip2/i2ellis.c
index 29db44de399f..29db44de399f 100644
--- a/drivers/char/ip2/i2ellis.c
+++ b/drivers/staging/tty/ip2/i2ellis.c
diff --git a/drivers/char/ip2/i2ellis.h b/drivers/staging/tty/ip2/i2ellis.h
index fb6df2456018..fb6df2456018 100644
--- a/drivers/char/ip2/i2ellis.h
+++ b/drivers/staging/tty/ip2/i2ellis.h
diff --git a/drivers/char/ip2/i2hw.h b/drivers/staging/tty/ip2/i2hw.h
index c0ba6c05f0cd..c0ba6c05f0cd 100644
--- a/drivers/char/ip2/i2hw.h
+++ b/drivers/staging/tty/ip2/i2hw.h
diff --git a/drivers/char/ip2/i2lib.c b/drivers/staging/tty/ip2/i2lib.c
index 0d10b89218ed..0d10b89218ed 100644
--- a/drivers/char/ip2/i2lib.c
+++ b/drivers/staging/tty/ip2/i2lib.c
diff --git a/drivers/char/ip2/i2lib.h b/drivers/staging/tty/ip2/i2lib.h
index e559e9bac06d..e559e9bac06d 100644
--- a/drivers/char/ip2/i2lib.h
+++ b/drivers/staging/tty/ip2/i2lib.h
diff --git a/drivers/char/ip2/i2pack.h b/drivers/staging/tty/ip2/i2pack.h
index 00342a677c90..00342a677c90 100644
--- a/drivers/char/ip2/i2pack.h
+++ b/drivers/staging/tty/ip2/i2pack.h
diff --git a/drivers/char/ip2/ip2.h b/drivers/staging/tty/ip2/ip2.h
index 936ccc533949..936ccc533949 100644
--- a/drivers/char/ip2/ip2.h
+++ b/drivers/staging/tty/ip2/ip2.h
diff --git a/drivers/char/ip2/ip2ioctl.h b/drivers/staging/tty/ip2/ip2ioctl.h
index aa0a9da85e05..aa0a9da85e05 100644
--- a/drivers/char/ip2/ip2ioctl.h
+++ b/drivers/staging/tty/ip2/ip2ioctl.h
diff --git a/drivers/char/ip2/ip2main.c b/drivers/staging/tty/ip2/ip2main.c
index ea7a8fb08283..ea7a8fb08283 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/staging/tty/ip2/ip2main.c
diff --git a/drivers/char/ip2/ip2trace.h b/drivers/staging/tty/ip2/ip2trace.h
index da20435dc8a6..da20435dc8a6 100644
--- a/drivers/char/ip2/ip2trace.h
+++ b/drivers/staging/tty/ip2/ip2trace.h
diff --git a/drivers/char/ip2/ip2types.h b/drivers/staging/tty/ip2/ip2types.h
index 9d67b260b2f6..9d67b260b2f6 100644
--- a/drivers/char/ip2/ip2types.h
+++ b/drivers/staging/tty/ip2/ip2types.h
diff --git a/drivers/char/istallion.c b/drivers/staging/tty/istallion.c
index 0b266272cccd..0b266272cccd 100644
--- a/drivers/char/istallion.c
+++ b/drivers/staging/tty/istallion.c
diff --git a/drivers/char/riscom8.c b/drivers/staging/tty/riscom8.c
index 602643a40b4b..602643a40b4b 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/staging/tty/riscom8.c
diff --git a/drivers/char/riscom8.h b/drivers/staging/tty/riscom8.h
index c9876b3f9714..c9876b3f9714 100644
--- a/drivers/char/riscom8.h
+++ b/drivers/staging/tty/riscom8.h
diff --git a/drivers/char/riscom8_reg.h b/drivers/staging/tty/riscom8_reg.h
index a32475ed0d18..a32475ed0d18 100644
--- a/drivers/char/riscom8_reg.h
+++ b/drivers/staging/tty/riscom8_reg.h
diff --git a/drivers/char/serial167.c b/drivers/staging/tty/serial167.c
index 674af6933978..674af6933978 100644
--- a/drivers/char/serial167.c
+++ b/drivers/staging/tty/serial167.c
diff --git a/drivers/char/specialix.c b/drivers/staging/tty/specialix.c
index 47e5753f732a..47e5753f732a 100644
--- a/drivers/char/specialix.c
+++ b/drivers/staging/tty/specialix.c
diff --git a/drivers/char/specialix_io8.h b/drivers/staging/tty/specialix_io8.h
index c63005274d9b..c63005274d9b 100644
--- a/drivers/char/specialix_io8.h
+++ b/drivers/staging/tty/specialix_io8.h
diff --git a/drivers/char/stallion.c b/drivers/staging/tty/stallion.c
index 4fff5cd3b163..4fff5cd3b163 100644
--- a/drivers/char/stallion.c
+++ b/drivers/staging/tty/stallion.c