Skip to content

Commit 4c37705

Browse files
committed
tty: move obsolete and broken generic_serial drivers to drivers/staging/generic_serial/
As planned by Arnd Bergmann, this moves the following drivers to the drivers/staging/generic_serial directory where they will be removed after 2.6.41 if no one steps up to claim them. generic_serial rio ser_a2232 sx vme_scc Cc: Arnd Bergmann <arnd@arndb.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1 parent 4a6514e commit 4c37705

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+60
-50
lines changed

drivers/char/Kconfig

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,6 @@ config DEVKMEM
1515
kind of kernel debugging operations.
1616
When in doubt, say "N".
1717

18-
config SX
19-
tristate "Specialix SX (and SI) card support"
20-
depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
21-
help
22-
This is a driver for the SX and SI multiport serial cards.
23-
Please read the file <file:Documentation/serial/sx.txt> for details.
24-
25-
This driver can only be built as a module ( = code which can be
26-
inserted in and removed from the running kernel whenever you want).
27-
The module will be called sx. If you want to do that, say M here.
28-
29-
config RIO
30-
tristate "Specialix RIO system support"
31-
depends on SERIAL_NONSTANDARD && BROKEN
32-
help
33-
This is a driver for the Specialix RIO, a smart serial card which
34-
drives an outboard box that can support up to 128 ports. Product
35-
information is at <http://www.perle.com/support/documentation.html#multiport>.
36-
There are both ISA and PCI versions.
37-
38-
config RIO_OLDPCI
39-
bool "Support really old RIO/PCI cards"
40-
depends on RIO
41-
help
42-
Older RIO PCI cards need some initialization-time configuration to
43-
determine the IRQ and some control addresses. If you have a RIO and
44-
this doesn't seem to work, try setting this to Y.
45-
4618
config STALDRV
4719
bool "Stallion multiport serial support"
4820
depends on SERIAL_NONSTANDARD
@@ -55,22 +27,6 @@ config STALDRV
5527
in this case. If you have never heard about all this, it's safe to
5628
say N.
5729

58-
config A2232
59-
tristate "Commodore A2232 serial support (EXPERIMENTAL)"
60-
depends on EXPERIMENTAL && ZORRO && BROKEN
61-
---help---
62-
This option supports the 2232 7-port serial card shipped with the
63-
Amiga 2000 and other Zorro-bus machines, dating from 1989. At
64-
a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
65-
each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
66-
ports were connected with 8 pin DIN connectors on the card bracket,
67-
for which 8 pin to DB25 adapters were supplied. The card also had
68-
jumpers internally to toggle various pinning configurations.
69-
70-
This driver can be built as a module; but then "generic_serial"
71-
will also be built as a module. This has to be loaded before
72-
"ser_a2232". If you want to do this, answer M here.
73-
7430
config SGI_SNSC
7531
bool "SGI Altix system controller communication support"
7632
depends on (IA64_SGI_SN2 || IA64_GENERIC)

drivers/char/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
obj-y += mem.o random.o
66
obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o
77
obj-y += misc.o
8-
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
9-
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
10-
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
11-
obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
128
obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
13-
obj-$(CONFIG_SX) += sx.o generic_serial.o
14-
obj-$(CONFIG_RIO) += rio/ generic_serial.o
159
obj-$(CONFIG_RAW_DRIVER) += raw.o
1610
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
1711
obj-$(CONFIG_MSPEC) += mspec.o

drivers/staging/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ if !STAGING_EXCLUDE_BUILD
4343

4444
source "drivers/staging/tty/Kconfig"
4545

46+
source "drivers/staging/generic_serial/Kconfig"
47+
4648
source "drivers/staging/et131x/Kconfig"
4749

4850
source "drivers/staging/slicoss/Kconfig"

drivers/staging/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
obj-$(CONFIG_STAGING) += staging.o
55

66
obj-y += tty/
7+
obj-y += generic_serial/
78
obj-$(CONFIG_ET131X) += et131x/
89
obj-$(CONFIG_SLICOSS) += slicoss/
910
obj-$(CONFIG_VIDEO_GO7007) += go7007/
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
config A2232
2+
tristate "Commodore A2232 serial support (EXPERIMENTAL)"
3+
depends on EXPERIMENTAL && ZORRO && BROKEN
4+
---help---
5+
This option supports the 2232 7-port serial card shipped with the
6+
Amiga 2000 and other Zorro-bus machines, dating from 1989. At
7+
a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
8+
each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
9+
ports were connected with 8 pin DIN connectors on the card bracket,
10+
for which 8 pin to DB25 adapters were supplied. The card also had
11+
jumpers internally to toggle various pinning configurations.
12+
13+
This driver can be built as a module; but then "generic_serial"
14+
will also be built as a module. This has to be loaded before
15+
"ser_a2232". If you want to do this, answer M here.
16+
17+
config SX
18+
tristate "Specialix SX (and SI) card support"
19+
depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
20+
help
21+
This is a driver for the SX and SI multiport serial cards.
22+
Please read the file <file:Documentation/serial/sx.txt> for details.
23+
24+
This driver can only be built as a module ( = code which can be
25+
inserted in and removed from the running kernel whenever you want).
26+
The module will be called sx. If you want to do that, say M here.
27+
28+
config RIO
29+
tristate "Specialix RIO system support"
30+
depends on SERIAL_NONSTANDARD && BROKEN
31+
help
32+
This is a driver for the Specialix RIO, a smart serial card which
33+
drives an outboard box that can support up to 128 ports. Product
34+
information is at <http://www.perle.com/support/documentation.html#multiport>.
35+
There are both ISA and PCI versions.
36+
37+
config RIO_OLDPCI
38+
bool "Support really old RIO/PCI cards"
39+
depends on RIO
40+
help
41+
Older RIO PCI cards need some initialization-time configuration to
42+
determine the IRQ and some control addresses. If you have a RIO and
43+
this doesn't seem to work, try setting this to Y.
44+
45+
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
2+
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
3+
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
4+
obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
5+
obj-$(CONFIG_SX) += sx.o generic_serial.o
6+
obj-$(CONFIG_RIO) += rio/ generic_serial.o
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
These are a few tty/serial drivers that either do not build,
2+
or work if they do build, or if they seem to work, are for obsolete
3+
hardware, or are full of unfixable races and no one uses them anymore.
4+
5+
If no one steps up to adopt any of these drivers, they will be removed
6+
in the 2.6.41 release.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)