diff options
| -rw-r--r-- | drivers/char/Kconfig | 44 | ||||
| -rw-r--r-- | drivers/char/Makefile | 6 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/Kconfig | 45 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/Makefile | 6 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/TODO | 6 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/generic_serial.c (renamed from drivers/char/generic_serial.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/Makefile (renamed from drivers/char/rio/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/board.h (renamed from drivers/char/rio/board.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/cirrus.h (renamed from drivers/char/rio/cirrus.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/cmdblk.h (renamed from drivers/char/rio/cmdblk.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/cmdpkt.h (renamed from drivers/char/rio/cmdpkt.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/daemon.h (renamed from drivers/char/rio/daemon.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/errors.h (renamed from drivers/char/rio/errors.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/func.h (renamed from drivers/char/rio/func.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/host.h (renamed from drivers/char/rio/host.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/link.h (renamed from drivers/char/rio/link.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/linux_compat.h (renamed from drivers/char/rio/linux_compat.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/map.h (renamed from drivers/char/rio/map.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/param.h (renamed from drivers/char/rio/param.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/parmmap.h (renamed from drivers/char/rio/parmmap.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/pci.h (renamed from drivers/char/rio/pci.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/phb.h (renamed from drivers/char/rio/phb.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/pkt.h (renamed from drivers/char/rio/pkt.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/port.h (renamed from drivers/char/rio/port.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/protsts.h (renamed from drivers/char/rio/protsts.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rio.h (renamed from drivers/char/rio/rio.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rio_linux.c (renamed from drivers/char/rio/rio_linux.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rio_linux.h (renamed from drivers/char/rio/rio_linux.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioboard.h (renamed from drivers/char/rio/rioboard.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioboot.c (renamed from drivers/char/rio/rioboot.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riocmd.c (renamed from drivers/char/rio/riocmd.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioctrl.c (renamed from drivers/char/rio/rioctrl.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riodrvr.h (renamed from drivers/char/rio/riodrvr.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioinfo.h (renamed from drivers/char/rio/rioinfo.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioinit.c (renamed from drivers/char/rio/rioinit.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riointr.c (renamed from drivers/char/rio/riointr.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioioctl.h (renamed from drivers/char/rio/rioioctl.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioparam.c (renamed from drivers/char/rio/rioparam.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioroute.c (renamed from drivers/char/rio/rioroute.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riospace.h (renamed from drivers/char/rio/riospace.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riotable.c (renamed from drivers/char/rio/riotable.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riotty.c (renamed from drivers/char/rio/riotty.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/route.h (renamed from drivers/char/rio/route.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rup.h (renamed from drivers/char/rio/rup.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/unixrup.h (renamed from drivers/char/rio/unixrup.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232.c (renamed from drivers/char/ser_a2232.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232.h (renamed from drivers/char/ser_a2232.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232fw.ax (renamed from drivers/char/ser_a2232fw.ax) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232fw.h (renamed from drivers/char/ser_a2232fw.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sx.c (renamed from drivers/char/sx.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sx.h (renamed from drivers/char/sx.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sxboards.h (renamed from drivers/char/sxboards.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sxwindow.h (renamed from drivers/char/sxwindow.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/vme_scc.c (renamed from drivers/char/vme_scc.c) | 0 |
56 files changed, 60 insertions, 50 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 7b8cf0295f6c..04f8b2d083c6 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -15,34 +15,6 @@ config DEVKMEM kind of kernel debugging operations. When in doubt, say "N". -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 @@ -55,22 +27,6 @@ config STALDRV in this case. If you have never heard about all this, it's safe to say N. -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) diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 48bb8acbea49..3ca1f627be8a 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -5,13 +5,7 @@ obj-y += mem.o random.o obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o 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_A2232) += ser_a2232.o generic_serial.o obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o -obj-$(CONFIG_SX) += sx.o generic_serial.o -obj-$(CONFIG_RIO) += rio/ generic_serial.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MSPEC) += mspec.o diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index fb1fc4e5a8cb..58e4a8e15a0e 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -43,6 +43,8 @@ if !STAGING_EXCLUDE_BUILD source "drivers/staging/tty/Kconfig" +source "drivers/staging/generic_serial/Kconfig" + source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f498e345a01d..ff7372d25c91 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_STAGING) += staging.o obj-y += tty/ +obj-y += generic_serial/ obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ diff --git a/drivers/staging/generic_serial/Kconfig b/drivers/staging/generic_serial/Kconfig new file mode 100644 index 000000000000..795daea37750 --- /dev/null +++ b/drivers/staging/generic_serial/Kconfig @@ -0,0 +1,45 @@ +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 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. + + diff --git a/drivers/staging/generic_serial/Makefile b/drivers/staging/generic_serial/Makefile new file mode 100644 index 000000000000..ffc90c8b013c --- /dev/null +++ b/drivers/staging/generic_serial/Makefile @@ -0,0 +1,6 @@ +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_A2232) += ser_a2232.o generic_serial.o +obj-$(CONFIG_SX) += sx.o generic_serial.o +obj-$(CONFIG_RIO) += rio/ generic_serial.o diff --git a/drivers/staging/generic_serial/TODO b/drivers/staging/generic_serial/TODO new file mode 100644 index 000000000000..88756453ac6c --- /dev/null +++ b/drivers/staging/generic_serial/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/generic_serial.c b/drivers/staging/generic_serial/generic_serial.c index 5954ee1dc953..5954ee1dc953 100644 --- a/drivers/char/generic_serial.c +++ b/drivers/staging/generic_serial/generic_serial.c diff --git a/drivers/char/rio/Makefile b/drivers/staging/generic_serial/rio/Makefile index 1661875883fb..1661875883fb 100644 --- a/drivers/char/rio/Makefile +++ b/drivers/staging/generic_serial/rio/Makefile diff --git a/drivers/char/rio/board.h b/drivers/staging/generic_serial/rio/board.h index bdea633a9076..bdea633a9076 100644 --- a/drivers/char/rio/board.h +++ b/drivers/staging/generic_serial/rio/board.h diff --git a/drivers/char/rio/cirrus.h b/drivers/staging/generic_serial/rio/cirrus.h index 5ab51679caa2..5ab51679caa2 100644 --- a/drivers/char/rio/cirrus.h +++ b/drivers/staging/generic_serial/rio/cirrus.h diff --git a/drivers/char/rio/cmdblk.h b/drivers/staging/generic_serial/rio/cmdblk.h index 9ed4f861675a..9ed4f861675a 100644 --- a/drivers/char/rio/cmdblk.h +++ b/drivers/staging/generic_serial/rio/cmdblk.h diff --git a/drivers/char/rio/cmdpkt.h b/drivers/staging/generic_serial/rio/cmdpkt.h index c1e7a2798070..c1e7a2798070 100644 --- a/drivers/char/rio/cmdpkt.h +++ b/drivers/staging/generic_serial/rio/cmdpkt.h diff --git a/drivers/char/rio/daemon.h b/drivers/staging/generic_serial/rio/daemon.h index 4af90323fd00..4af90323fd00 100644 --- a/drivers/char/rio/daemon.h +++ b/drivers/staging/generic_serial/rio/daemon.h diff --git a/drivers/char/rio/errors.h b/drivers/staging/generic_serial/rio/errors.h index bdb05234090a..bdb05234090a 100644 --- a/drivers/char/rio/errors.h +++ b/drivers/staging/generic_serial/rio/errors.h diff --git a/drivers/char/rio/func.h b/drivers/staging/generic_serial/rio/func.h index 078d44f85e45..078d44f85e45 100644 --- a/drivers/char/rio/func.h +++ b/drivers/staging/generic_serial/rio/func.h diff --git a/drivers/char/rio/host.h b/drivers/staging/generic_serial/rio/host.h index 78f24540c224..78f24540c224 100644 --- a/drivers/char/rio/host.h +++ b/drivers/staging/generic_serial/rio/host.h diff --git a/drivers/char/rio/link.h b/drivers/staging/generic_serial/rio/link.h index f3bf11a04d41..f3bf11a04d41 100644 --- a/drivers/char/rio/link.h +++ b/drivers/staging/generic_serial/rio/link.h diff --git a/drivers/char/rio/linux_compat.h b/drivers/staging/generic_serial/rio/linux_compat.h index 34c0d2899ef1..34c0d2899ef1 100644 --- a/drivers/char/rio/linux_compat.h +++ b/drivers/staging/generic_serial/rio/linux_compat.h diff --git a/drivers/char/rio/map.h b/drivers/staging/generic_serial/rio/map.h index 8366978578c1..8366978578c1 100644 --- a/drivers/char/rio/map.h +++ b/drivers/staging/generic_serial/rio/map.h diff --git a/drivers/char/rio/param.h b/drivers/staging/generic_serial/rio/param.h index 7e9b6283e8aa..7e9b6283e8aa 100644 --- a/drivers/char/rio/param.h +++ b/drivers/staging/generic_serial/rio/param.h diff --git a/drivers/char/rio/parmmap.h b/drivers/staging/generic_serial/rio/parmmap.h index acc8fa439df5..acc8fa439df5 100644 --- a/drivers/char/rio/parmmap.h +++ b/drivers/staging/generic_serial/rio/parmmap.h diff --git a/drivers/char/rio/pci.h b/drivers/staging/generic_serial/rio/pci.h index 6032f9135956..6032f9135956 100644 --- a/drivers/char/rio/pci.h +++ b/drivers/staging/generic_serial/rio/pci.h diff --git a/drivers/char/rio/phb.h b/drivers/staging/generic_serial/rio/phb.h index a4c48ae4e365..a4c48ae4e365 100644 --- a/drivers/char/rio/phb.h +++ b/drivers/staging/generic_serial/rio/phb.h diff --git a/drivers/char/rio/pkt.h b/drivers/staging/generic_serial/rio/pkt.h index a9458164f02f..a9458164f02f 100644 --- a/drivers/char/rio/pkt.h +++ b/drivers/staging/generic_serial/rio/pkt.h diff --git a/drivers/char/rio/port.h b/drivers/staging/generic_serial/rio/port.h index 49cf6d15ee54..49cf6d15ee54 100644 --- a/drivers/char/rio/port.h +++ b/drivers/staging/generic_serial/rio/port.h diff --git a/drivers/char/rio/protsts.h b/drivers/staging/generic_serial/rio/protsts.h index 8ab79401d3ee..8ab79401d3ee 100644 --- a/drivers/char/rio/protsts.h +++ b/drivers/staging/generic_serial/rio/protsts.h diff --git a/drivers/char/rio/rio.h b/drivers/staging/generic_serial/rio/rio.h index 1bf36223a4e8..1bf36223a4e8 100644 --- a/drivers/char/rio/rio.h +++ b/drivers/staging/generic_serial/rio/rio.h diff --git a/drivers/char/rio/rio_linux.c b/drivers/staging/generic_serial/rio/rio_linux.c index 5e33293d24e3..5e33293d24e3 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/staging/generic_serial/rio/rio_linux.c diff --git a/drivers/char/rio/rio_linux.h b/drivers/staging/generic_serial/rio/rio_linux.h index 7f26cd7c815e..7f26cd7c815e 100644 --- a/drivers/char/rio/rio_linux.h +++ b/drivers/staging/generic_serial/rio/rio_linux.h diff --git a/drivers/char/rio/rioboard.h b/drivers/staging/generic_serial/rio/rioboard.h index 252230043c82..252230043c82 100644 --- a/drivers/char/rio/rioboard.h +++ b/drivers/staging/generic_serial/rio/rioboard.h diff --git a/drivers/char/rio/rioboot.c b/drivers/staging/generic_serial/rio/rioboot.c index d956dd316005..d956dd316005 100644 --- a/drivers/char/rio/rioboot.c +++ b/drivers/staging/generic_serial/rio/rioboot.c diff --git a/drivers/char/rio/riocmd.c b/drivers/staging/generic_serial/rio/riocmd.c index f121357e5af0..f121357e5af0 100644 --- a/drivers/char/rio/riocmd.c +++ b/drivers/staging/generic_serial/rio/riocmd.c diff --git a/drivers/char/rio/rioctrl.c b/drivers/staging/generic_serial/rio/rioctrl.c index 780506326a73..780506326a73 100644 --- a/drivers/char/rio/rioctrl.c +++ b/drivers/staging/generic_serial/rio/rioctrl.c diff --git a/drivers/char/rio/riodrvr.h b/drivers/staging/generic_serial/rio/riodrvr.h index 0907e711b355..0907e711b355 100644 --- a/drivers/char/rio/riodrvr.h +++ b/drivers/staging/generic_serial/rio/riodrvr.h diff --git a/drivers/char/rio/rioinfo.h b/drivers/staging/generic_serial/rio/rioinfo.h index 42ff1e79d96f..42ff1e79d96f 100644 --- a/drivers/char/rio/rioinfo.h +++ b/drivers/staging/generic_serial/rio/rioinfo.h diff --git a/drivers/char/rio/rioinit.c b/drivers/staging/generic_serial/rio/rioinit.c index 24a282bb89d4..24a282bb89d4 100644 --- a/drivers/char/rio/rioinit.c +++ b/drivers/staging/generic_serial/rio/rioinit.c diff --git a/drivers/char/rio/riointr.c b/drivers/staging/generic_serial/rio/riointr.c index 2e71aecae206..2e71aecae206 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/staging/generic_serial/rio/riointr.c diff --git a/drivers/char/rio/rioioctl.h b/drivers/staging/generic_serial/rio/rioioctl.h index e8af5b30519e..e8af5b30519e 100644 --- a/drivers/char/rio/rioioctl.h +++ b/drivers/staging/generic_serial/rio/rioioctl.h diff --git a/drivers/char/rio/rioparam.c b/drivers/staging/generic_serial/rio/rioparam.c index 6415f3f32a72..6415f3f32a72 100644 --- a/drivers/char/rio/rioparam.c +++ b/drivers/staging/generic_serial/rio/rioparam.c diff --git a/drivers/char/rio/rioroute.c b/drivers/staging/generic_serial/rio/rioroute.c index f9b936ac3394..f9b936ac3394 100644 --- a/drivers/char/rio/rioroute.c +++ b/drivers/staging/generic_serial/rio/rioroute.c diff --git a/drivers/char/rio/riospace.h b/drivers/staging/generic_serial/rio/riospace.h index ffb31d4332b9..ffb31d4332b9 100644 --- a/drivers/char/rio/riospace.h +++ b/drivers/staging/generic_serial/rio/riospace.h diff --git a/drivers/char/rio/riotable.c b/drivers/staging/generic_serial/rio/riotable.c index 3d15802dc0f3..3d15802dc0f3 100644 --- a/drivers/char/rio/riotable.c +++ b/drivers/staging/generic_serial/rio/riotable.c diff --git a/drivers/char/rio/riotty.c b/drivers/staging/generic_serial/rio/riotty.c index 8a90393faf3c..8a90393faf3c 100644 --- a/drivers/char/rio/riotty.c +++ b/drivers/staging/generic_serial/rio/riotty.c diff --git a/drivers/char/rio/route.h b/drivers/staging/generic_serial/rio/route.h index 46e963771c30..46e963771c30 100644 --- a/drivers/char/rio/route.h +++ b/drivers/staging/generic_serial/rio/route.h diff --git a/drivers/char/rio/rup.h b/drivers/staging/generic_serial/rio/rup.h index 4ae90cb207a9..4ae90cb207a9 100644 --- a/drivers/char/rio/rup.h +++ b/drivers/staging/generic_serial/rio/rup.h diff --git a/drivers/char/rio/unixrup.h b/drivers/staging/generic_serial/rio/unixrup.h index 7abf0cba0f2c..7abf0cba0f2c 100644 --- a/drivers/char/rio/unixrup.h +++ b/drivers/staging/generic_serial/rio/unixrup.h diff --git a/drivers/char/ser_a2232.c b/drivers/staging/generic_serial/ser_a2232.c index 3f47c2ead8e5..3f47c2ead8e5 100644 --- a/drivers/char/ser_a2232.c +++ b/drivers/staging/generic_serial/ser_a2232.c diff --git a/drivers/char/ser_a2232.h b/drivers/staging/generic_serial/ser_a2232.h index bc09eb9e118b..bc09eb9e118b 100644 --- a/drivers/char/ser_a2232.h +++ b/drivers/staging/generic_serial/ser_a2232.h diff --git a/drivers/char/ser_a2232fw.ax b/drivers/staging/generic_serial/ser_a2232fw.ax index 736438032768..736438032768 100644 --- a/drivers/char/ser_a2232fw.ax +++ b/drivers/staging/generic_serial/ser_a2232fw.ax diff --git a/drivers/char/ser_a2232fw.h b/drivers/staging/generic_serial/ser_a2232fw.h index e09a30acfe5c..e09a30acfe5c 100644 --- a/drivers/char/ser_a2232fw.h +++ b/drivers/staging/generic_serial/ser_a2232fw.h diff --git a/drivers/char/sx.c b/drivers/staging/generic_serial/sx.c index 1291462bcddb..1291462bcddb 100644 --- a/drivers/char/sx.c +++ b/drivers/staging/generic_serial/sx.c diff --git a/drivers/char/sx.h b/drivers/staging/generic_serial/sx.h index 87c2defdead7..87c2defdead7 100644 --- a/drivers/char/sx.h +++ b/drivers/staging/generic_serial/sx.h diff --git a/drivers/char/sxboards.h b/drivers/staging/generic_serial/sxboards.h index 427927dc7dbf..427927dc7dbf 100644 --- a/drivers/char/sxboards.h +++ b/drivers/staging/generic_serial/sxboards.h diff --git a/drivers/char/sxwindow.h b/drivers/staging/generic_serial/sxwindow.h index cf01b662aefc..cf01b662aefc 100644 --- a/drivers/char/sxwindow.h +++ b/drivers/staging/generic_serial/sxwindow.h diff --git a/drivers/char/vme_scc.c b/drivers/staging/generic_serial/vme_scc.c index 96838640f575..96838640f575 100644 --- a/drivers/char/vme_scc.c +++ b/drivers/staging/generic_serial/vme_scc.c |