diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 00:39:23 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 00:39:23 (GMT) |
commit | fc887b15d935ead2a00aef5779a18034e7c69ee1 (patch) | |
tree | 30daa1c9bafbf179047047c67d11ccd98e27d809 | |
parent | 466c19063b4b426d5c362572787cb249fbf4296b (diff) | |
parent | df6212529c646710502657b18d8f42927f3dda81 (diff) | |
download | linux-fsl-qoriq-fc887b15d935ead2a00aef5779a18034e7c69ee1.tar.xz |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty: update MAINTAINERS file due to driver movement
tty: move drivers/serial/ to drivers/tty/serial/
tty: move hvc drivers to drivers/tty/hvc/
-rw-r--r-- | MAINTAINERS | 50 | ||||
-rw-r--r-- | drivers/Makefile | 3 | ||||
-rw-r--r-- | drivers/char/Kconfig | 2 | ||||
-rw-r--r-- | drivers/char/Makefile | 13 | ||||
-rw-r--r-- | drivers/tty/Makefile | 2 | ||||
-rw-r--r-- | drivers/tty/hvc/Makefile | 13 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_beat.c (renamed from drivers/char/hvc_beat.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_console.c (renamed from drivers/char/hvc_console.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_console.h (renamed from drivers/char/hvc_console.h) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_dcc.c (renamed from drivers/char/hvc_dcc.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_irq.c (renamed from drivers/char/hvc_irq.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_iseries.c (renamed from drivers/char/hvc_iseries.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_iucv.c (renamed from drivers/char/hvc_iucv.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_rtas.c (renamed from drivers/char/hvc_rtas.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_tile.c (renamed from drivers/char/hvc_tile.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_udbg.c (renamed from drivers/char/hvc_udbg.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_vio.c (renamed from drivers/char/hvc_vio.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvc_xen.c (renamed from drivers/char/hvc_xen.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvcs.c (renamed from drivers/char/hvcs.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/hvsi.c (renamed from drivers/char/hvsi.c) | 0 | ||||
-rw-r--r-- | drivers/tty/hvc/virtio_console.c (renamed from drivers/char/virtio_console.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/21285.c (renamed from drivers/serial/21285.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/68328serial.c (renamed from drivers/serial/68328serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/68328serial.h (renamed from drivers/serial/68328serial.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/68360serial.c (renamed from drivers/serial/68360serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250.c (renamed from drivers/serial/8250.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250.h (renamed from drivers/serial/8250.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_accent.c (renamed from drivers/serial/8250_accent.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_acorn.c (renamed from drivers/serial/8250_acorn.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_boca.c (renamed from drivers/serial/8250_boca.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_early.c (renamed from drivers/serial/8250_early.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_exar_st16c554.c (renamed from drivers/serial/8250_exar_st16c554.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_fourport.c (renamed from drivers/serial/8250_fourport.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_gsc.c (renamed from drivers/serial/8250_gsc.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_hp300.c (renamed from drivers/serial/8250_hp300.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_hub6.c (renamed from drivers/serial/8250_hub6.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_mca.c (renamed from drivers/serial/8250_mca.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_pci.c (renamed from drivers/serial/8250_pci.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/8250_pnp.c (renamed from drivers/serial/8250_pnp.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/Kconfig (renamed from drivers/serial/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/Makefile (renamed from drivers/serial/Makefile) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/altera_jtaguart.c (renamed from drivers/serial/altera_jtaguart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/altera_uart.c (renamed from drivers/serial/altera_uart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/amba-pl010.c (renamed from drivers/serial/amba-pl010.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/amba-pl011.c (renamed from drivers/serial/amba-pl011.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/apbuart.c (renamed from drivers/serial/apbuart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/apbuart.h (renamed from drivers/serial/apbuart.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/atmel_serial.c (renamed from drivers/serial/atmel_serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/bcm63xx_uart.c (renamed from drivers/serial/bcm63xx_uart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/bfin_5xx.c (renamed from drivers/serial/bfin_5xx.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/bfin_sport_uart.c (renamed from drivers/serial/bfin_sport_uart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/bfin_sport_uart.h (renamed from drivers/serial/bfin_sport_uart.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/clps711x.c (renamed from drivers/serial/clps711x.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/cpm_uart/Makefile (renamed from drivers/serial/cpm_uart/Makefile) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart.h (renamed from drivers/serial/cpm_uart/cpm_uart.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_core.c (renamed from drivers/serial/cpm_uart/cpm_uart_core.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c (renamed from drivers/serial/cpm_uart/cpm_uart_cpm1.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h (renamed from drivers/serial/cpm_uart/cpm_uart_cpm1.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c (renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h (renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/crisv10.c (renamed from drivers/serial/crisv10.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/crisv10.h (renamed from drivers/serial/crisv10.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/dz.c (renamed from drivers/serial/dz.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/dz.h (renamed from drivers/serial/dz.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/icom.c (renamed from drivers/serial/icom.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/icom.h (renamed from drivers/serial/icom.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/ifx6x60.c (renamed from drivers/serial/ifx6x60.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/ifx6x60.h (renamed from drivers/serial/ifx6x60.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/imx.c (renamed from drivers/serial/imx.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/ioc3_serial.c (renamed from drivers/serial/ioc3_serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/ioc4_serial.c (renamed from drivers/serial/ioc4_serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/ip22zilog.c (renamed from drivers/serial/ip22zilog.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/ip22zilog.h (renamed from drivers/serial/ip22zilog.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/jsm/Makefile (renamed from drivers/serial/jsm/Makefile) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/jsm/jsm.h (renamed from drivers/serial/jsm/jsm.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/jsm/jsm_driver.c (renamed from drivers/serial/jsm/jsm_driver.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/jsm/jsm_neo.c (renamed from drivers/serial/jsm/jsm_neo.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/jsm/jsm_tty.c (renamed from drivers/serial/jsm/jsm_tty.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/kgdboc.c (renamed from drivers/serial/kgdboc.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/m32r_sio.c (renamed from drivers/serial/m32r_sio.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/m32r_sio.h (renamed from drivers/serial/m32r_sio.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/m32r_sio_reg.h (renamed from drivers/serial/m32r_sio_reg.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/max3100.c (renamed from drivers/serial/max3100.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/max3107-aava.c (renamed from drivers/serial/max3107-aava.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/max3107.c (renamed from drivers/serial/max3107.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/max3107.h (renamed from drivers/serial/max3107.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/mcf.c (renamed from drivers/serial/mcf.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/mfd.c (renamed from drivers/serial/mfd.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/mpc52xx_uart.c (renamed from drivers/serial/mpc52xx_uart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/mpsc.c (renamed from drivers/serial/mpsc.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/mrst_max3110.c (renamed from drivers/serial/mrst_max3110.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/mrst_max3110.h (renamed from drivers/serial/mrst_max3110.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/msm_serial.c (renamed from drivers/serial/msm_serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/msm_serial.h (renamed from drivers/serial/msm_serial.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/mux.c (renamed from drivers/serial/mux.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/netx-serial.c (renamed from drivers/serial/netx-serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/nwpserial.c (renamed from drivers/serial/nwpserial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/of_serial.c (renamed from drivers/serial/of_serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/omap-serial.c (renamed from drivers/serial/omap-serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/pch_uart.c (renamed from drivers/serial/pch_uart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/pmac_zilog.c (renamed from drivers/serial/pmac_zilog.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/pmac_zilog.h (renamed from drivers/serial/pmac_zilog.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/pnx8xxx_uart.c (renamed from drivers/serial/pnx8xxx_uart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/pxa.c (renamed from drivers/serial/pxa.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/s3c2400.c (renamed from drivers/serial/s3c2400.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/s3c2410.c (renamed from drivers/serial/s3c2410.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/s3c2412.c (renamed from drivers/serial/s3c2412.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/s3c2440.c (renamed from drivers/serial/s3c2440.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/s3c24a0.c (renamed from drivers/serial/s3c24a0.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/s3c6400.c (renamed from drivers/serial/s3c6400.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/s5pv210.c (renamed from drivers/serial/s5pv210.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sa1100.c (renamed from drivers/serial/sa1100.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/samsung.c (renamed from drivers/serial/samsung.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/samsung.h (renamed from drivers/serial/samsung.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sb1250-duart.c (renamed from drivers/serial/sb1250-duart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sc26xx.c (renamed from drivers/serial/sc26xx.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/serial_core.c (renamed from drivers/serial/serial_core.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/serial_cs.c (renamed from drivers/serial/serial_cs.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/serial_ks8695.c (renamed from drivers/serial/serial_ks8695.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/serial_lh7a40x.c (renamed from drivers/serial/serial_lh7a40x.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/serial_txx9.c (renamed from drivers/serial/serial_txx9.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sh-sci.c (renamed from drivers/serial/sh-sci.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sh-sci.h (renamed from drivers/serial/sh-sci.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sn_console.c (renamed from drivers/serial/sn_console.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/suncore.c (renamed from drivers/serial/suncore.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/suncore.h (renamed from drivers/serial/suncore.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sunhv.c (renamed from drivers/serial/sunhv.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sunsab.c (renamed from drivers/serial/sunsab.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sunsab.h (renamed from drivers/serial/sunsab.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sunsu.c (renamed from drivers/serial/sunsu.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sunzilog.c (renamed from drivers/serial/sunzilog.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/sunzilog.h (renamed from drivers/serial/sunzilog.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/timbuart.c (renamed from drivers/serial/timbuart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/timbuart.h (renamed from drivers/serial/timbuart.h) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/uartlite.c (renamed from drivers/serial/uartlite.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/ucc_uart.c (renamed from drivers/serial/ucc_uart.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/vr41xx_siu.c (renamed from drivers/serial/vr41xx_siu.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/vt8500_serial.c (renamed from drivers/serial/vt8500_serial.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/zs.c (renamed from drivers/serial/zs.c) | 0 | ||||
-rw-r--r-- | drivers/tty/serial/zs.h (renamed from drivers/serial/zs.h) | 0 |
140 files changed, 42 insertions, 41 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1af022e..2e14fd7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -162,7 +162,7 @@ L: linux-serial@vger.kernel.org W: http://serial.sourceforge.net S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git -F: drivers/serial/8250* +F: drivers/tty/serial/8250* F: include/linux/serial_8250.h 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.] @@ -888,8 +888,8 @@ F: arch/arm/mach-msm/ F: drivers/video/msm/ F: drivers/mmc/host/msm_sdcc.c F: drivers/mmc/host/msm_sdcc.h -F: drivers/serial/msm_serial.h -F: drivers/serial/msm_serial.c +F: drivers/tty/serial/msm_serial.h +F: drivers/tty/serial/msm_serial.c T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git S: Maintained @@ -1256,7 +1256,7 @@ F: drivers/mmc/host/atmel-mci-regs.h ATMEL AT91 / AT32 SERIAL DRIVER M: Nicolas Ferre <nicolas.ferre@atmel.com> S: Supported -F: drivers/serial/atmel_serial.c +F: drivers/tty/serial/atmel_serial.c ATMEL LCDFB DRIVER M: Nicolas Ferre <nicolas.ferre@atmel.com> @@ -1412,7 +1412,7 @@ M: Sonic Zhang <sonic.zhang@analog.com> L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org S: Supported -F: drivers/serial/bfin_5xx.c +F: drivers/tty/serial/bfin_5xx.c BLACKFIN WATCHDOG DRIVER M: Mike Frysinger <vapier.adi@gmail.com> @@ -1877,7 +1877,7 @@ L: linux-cris-kernel@axis.com W: http://developer.axis.com S: Maintained F: arch/cris/ -F: drivers/serial/crisv10.* +F: drivers/tty/serial/crisv10.* CRYPTO API M: Herbert Xu <herbert@gondor.apana.org.au> @@ -2216,7 +2216,7 @@ F: drivers/net/wan/dscc4.c DZ DECSTATION DZ11 SERIAL DRIVER M: "Maciej W. Rozycki" <macro@linux-mips.org> S: Maintained -F: drivers/serial/dz.* +F: drivers/tty/serial/dz.* EATA-DMA SCSI DRIVER M: Michael Neuffer <mike@i-Connect.Net> @@ -2643,7 +2643,7 @@ FREESCALE QUICC ENGINE UCC UART DRIVER M: Timur Tabi <timur@freescale.com> L: linuxppc-dev@lists.ozlabs.org S: Supported -F: drivers/serial/ucc_uart.c +F: drivers/tty/serial/ucc_uart.c FREESCALE SOC SOUND DRIVERS M: Timur Tabi <timur@freescale.com> @@ -3350,7 +3350,7 @@ IOC3 SERIAL DRIVER M: Pat Gefre <pfg@sgi.com> L: linux-serial@vger.kernel.org S: Maintained -F: drivers/serial/ioc3_serial.c +F: drivers/tty/serial/ioc3_serial.c IP MASQUERADING M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> @@ -3527,7 +3527,7 @@ JSM Neo PCI based serial card M: Breno Leitao <leitao@linux.vnet.ibm.com> L: linux-serial@vger.kernel.org S: Maintained -F: drivers/serial/jsm/ +F: drivers/tty/serial/jsm/ K10TEMP HARDWARE MONITORING DRIVER M: Clemens Ladisch <clemens@ladisch.de> @@ -3677,7 +3677,7 @@ L: kgdb-bugreport@lists.sourceforge.net S: Maintained F: Documentation/DocBook/kgdb.tmpl F: drivers/misc/kgdbts.c -F: drivers/serial/kgdboc.c +F: drivers/tty/serial/kgdboc.c F: include/linux/kdb.h F: include/linux/kgdb.h F: kernel/debug/ @@ -5545,7 +5545,7 @@ M: Pat Gefre <pfg@sgi.com> L: linux-ia64@vger.kernel.org S: Supported F: Documentation/ia64/serial.txt -F: drivers/serial/ioc?_serial.c +F: drivers/tty/serial/ioc?_serial.c F: include/linux/ioc?.h SGI VISUAL WORKSTATION 320 AND 540 @@ -5567,7 +5567,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen F: arch/arm/mach-lh7a40x/ -F: drivers/serial/serial_lh7a40x.c +F: drivers/tty/serial/serial_lh7a40x.c F: drivers/usb/gadget/lh7a40* F: drivers/usb/host/ohci-lh7a40* @@ -5787,14 +5787,14 @@ L: sparclinux@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git S: Maintained -F: drivers/serial/suncore.c -F: drivers/serial/suncore.h -F: drivers/serial/sunhv.c -F: drivers/serial/sunsab.c -F: drivers/serial/sunsab.h -F: drivers/serial/sunsu.c -F: drivers/serial/sunzilog.c -F: drivers/serial/sunzilog.h +F: drivers/tty/serial/suncore.c +F: drivers/tty/serial/suncore.h +F: drivers/tty/serial/sunhv.c +F: drivers/tty/serial/sunsab.c +F: drivers/tty/serial/sunsab.h +F: drivers/tty/serial/sunsu.c +F: drivers/tty/serial/sunzilog.c +F: drivers/tty/serial/sunzilog.h SPEAR PLATFORM SUPPORT M: Viresh Kumar <viresh.kumar@st.com> @@ -6124,8 +6124,8 @@ TTY LAYER M: Greg Kroah-Hartman <gregkh@suse.de> S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git -F: drivers/char/tty_* -F: drivers/serial/serial_core.c +F: drivers/tty/* +F: drivers/tty/serial/serial_core.c F: include/linux/serial_core.h F: include/linux/serial.h F: include/linux/tty.h @@ -6870,7 +6870,7 @@ XILINX UARTLITE SERIAL DRIVER M: Peter Korsgaard <jacmet@sunsite.dk> L: linux-serial@vger.kernel.org S: Maintained -F: drivers/serial/uartlite.c +F: drivers/tty/serial/uartlite.c YAM DRIVER FOR AX.25 M: Jean-Paul Roubelat <jpr@f6fbb.org> @@ -6916,7 +6916,7 @@ F: drivers/media/video/zoran/ ZS DECSTATION Z85C30 SERIAL DRIVER M: "Maciej W. Rozycki" <macro@linux-mips.org> S: Maintained -F: drivers/serial/zs.* +F: drivers/tty/serial/zs.* GRE DEMULTIPLEXER DRIVER M: Dmitry Kozlov <xeb@mail.ru> diff --git a/drivers/Makefile b/drivers/Makefile index 7eb35f4..b423bb1 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_XEN) += xen/ # regulators early, since some subsystems rely on them to initialize obj-$(CONFIG_REGULATOR) += regulator/ -# char/ comes before serial/ etc so that the VT console is the boot-time +# tty/ comes before char/ so that the VT console is the boot-time # default. obj-y += tty/ obj-y += char/ @@ -38,7 +38,6 @@ obj-$(CONFIG_CONNECTOR) += connector/ obj-$(CONFIG_FB_I810) += video/i810/ obj-$(CONFIG_FB_INTEL) += video/intelfb/ -obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ nfc/ obj-$(CONFIG_NUBUS) += nubus/ diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 0f175a8..ccac7d0 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -426,7 +426,7 @@ config SGI_MBCS If you have an SGI Altix with an attached SABrick say Y or M here, otherwise say N. -source "drivers/serial/Kconfig" +source "drivers/tty/serial/Kconfig" config UNIX98_PTYS bool "Unix98 PTY support" if EMBEDDED diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 1e9dffb..5bc765d 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -30,25 +30,12 @@ obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_RIO) += rio/ generic_serial.o -obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o -obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o -obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o -obj-$(CONFIG_HVC_TILE) += hvc_tile.o -obj-$(CONFIG_HVC_DCC) += hvc_dcc.o -obj-$(CONFIG_HVC_BEAT) += hvc_beat.o -obj-$(CONFIG_HVC_DRIVER) += hvc_console.o -obj-$(CONFIG_HVC_IRQ) += hvc_irq.o -obj-$(CONFIG_HVC_XEN) += hvc_xen.o -obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o -obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o -obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MSPEC) += mspec.o obj-$(CONFIG_MMTIMER) += mmtimer.o obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o obj-$(CONFIG_VIOTAPE) += viotape.o -obj-$(CONFIG_HVCS) += hvcs.o obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index c43ef48..3962772 100644 --- a/drivers/tty/Makefile +++ b/drivers/tty/Makefile @@ -9,3 +9,5 @@ obj-$(CONFIG_N_GSM) += n_gsm.o obj-$(CONFIG_R3964) += n_r3964.o obj-y += vt/ +obj-$(CONFIG_HVC_DRIVER) += hvc/ +obj-y += serial/ diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile new file mode 100644 index 0000000..e6bed5f --- /dev/null +++ b/drivers/tty/hvc/Makefile @@ -0,0 +1,13 @@ +obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o +obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o +obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o +obj-$(CONFIG_HVC_TILE) += hvc_tile.o +obj-$(CONFIG_HVC_DCC) += hvc_dcc.o +obj-$(CONFIG_HVC_BEAT) += hvc_beat.o +obj-$(CONFIG_HVC_DRIVER) += hvc_console.o +obj-$(CONFIG_HVC_IRQ) += hvc_irq.o +obj-$(CONFIG_HVC_XEN) += hvc_xen.o +obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o +obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o +obj-$(CONFIG_HVCS) += hvcs.o +obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o diff --git a/drivers/char/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c index 5fe4631..5fe4631 100644 --- a/drivers/char/hvc_beat.c +++ b/drivers/tty/hvc/hvc_beat.c diff --git a/drivers/char/hvc_console.c b/drivers/tty/hvc/hvc_console.c index e9cba13..e9cba13 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/tty/hvc/hvc_console.c diff --git a/drivers/char/hvc_console.h b/drivers/tty/hvc/hvc_console.h index 54381eba..54381eba 100644 --- a/drivers/char/hvc_console.h +++ b/drivers/tty/hvc/hvc_console.h diff --git a/drivers/char/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c index 6470f63..6470f63 100644 --- a/drivers/char/hvc_dcc.c +++ b/drivers/tty/hvc/hvc_dcc.c diff --git a/drivers/char/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c index 2623e17..2623e17 100644 --- a/drivers/char/hvc_irq.c +++ b/drivers/tty/hvc/hvc_irq.c diff --git a/drivers/char/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c index 21c5495..21c5495 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/tty/hvc/hvc_iseries.c diff --git a/drivers/char/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c index c3425bb..c3425bb 100644 --- a/drivers/char/hvc_iucv.c +++ b/drivers/tty/hvc/hvc_iucv.c diff --git a/drivers/char/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c index 61c4a61..61c4a61 100644 --- a/drivers/char/hvc_rtas.c +++ b/drivers/tty/hvc/hvc_rtas.c diff --git a/drivers/char/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c index 7a84a05..7a84a05 100644 --- a/drivers/char/hvc_tile.c +++ b/drivers/tty/hvc/hvc_tile.c diff --git a/drivers/char/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c index b0957e6..b0957e6 100644 --- a/drivers/char/hvc_udbg.c +++ b/drivers/tty/hvc/hvc_udbg.c diff --git a/drivers/char/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index 5e2f52b..5e2f52b 100644 --- a/drivers/char/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c diff --git a/drivers/char/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 3740e32..3740e32 100644 --- a/drivers/char/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c diff --git a/drivers/char/hvcs.c b/drivers/tty/hvc/hvcs.c index bedc6c1..bedc6c1 100644 --- a/drivers/char/hvcs.c +++ b/drivers/tty/hvc/hvcs.c diff --git a/drivers/char/hvsi.c b/drivers/tty/hvc/hvsi.c index 67a75a5..67a75a5 100644 --- a/drivers/char/hvsi.c +++ b/drivers/tty/hvc/hvsi.c diff --git a/drivers/char/virtio_console.c b/drivers/tty/hvc/virtio_console.c index 896a2ce..896a2ce 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/tty/hvc/virtio_console.c diff --git a/drivers/serial/21285.c b/drivers/tty/serial/21285.c index d89aa38..d89aa38 100644 --- a/drivers/serial/21285.c +++ b/drivers/tty/serial/21285.c diff --git a/drivers/serial/68328serial.c b/drivers/tty/serial/68328serial.c index be0ebce..be0ebce 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c diff --git a/drivers/serial/68328serial.h b/drivers/tty/serial/68328serial.h index 664ceb0..664ceb0 100644 --- a/drivers/serial/68328serial.h +++ b/drivers/tty/serial/68328serial.h diff --git a/drivers/serial/68360serial.c b/drivers/tty/serial/68360serial.c index 88b1335..88b1335 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/tty/serial/68360serial.c diff --git a/drivers/serial/8250.c b/drivers/tty/serial/8250.c index b25e6e4..b25e6e4 100644 --- a/drivers/serial/8250.c +++ b/drivers/tty/serial/8250.c diff --git a/drivers/serial/8250.h b/drivers/tty/serial/8250.h index 6e19ea3..6e19ea3 100644 --- a/drivers/serial/8250.h +++ b/drivers/tty/serial/8250.h diff --git a/drivers/serial/8250_accent.c b/drivers/tty/serial/8250_accent.c index 9c10262..9c10262 100644 --- a/drivers/serial/8250_accent.c +++ b/drivers/tty/serial/8250_accent.c diff --git a/drivers/serial/8250_acorn.c b/drivers/tty/serial/8250_acorn.c index b0ce8c5..b0ce8c5 100644 --- a/drivers/serial/8250_acorn.c +++ b/drivers/tty/serial/8250_acorn.c diff --git a/drivers/serial/8250_boca.c b/drivers/tty/serial/8250_boca.c index 3bfe0f7..3bfe0f7 100644 --- a/drivers/serial/8250_boca.c +++ b/drivers/tty/serial/8250_boca.c diff --git a/drivers/serial/8250_early.c b/drivers/tty/serial/8250_early.c index eaafb98..eaafb98 100644 --- a/drivers/serial/8250_early.c +++ b/drivers/tty/serial/8250_early.c diff --git a/drivers/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250_exar_st16c554.c index 567143a..567143a 100644 --- a/drivers/serial/8250_exar_st16c554.c +++ b/drivers/tty/serial/8250_exar_st16c554.c diff --git a/drivers/serial/8250_fourport.c b/drivers/tty/serial/8250_fourport.c index 6375d68..6375d68 100644 --- a/drivers/serial/8250_fourport.c +++ b/drivers/tty/serial/8250_fourport.c diff --git a/drivers/serial/8250_gsc.c b/drivers/tty/serial/8250_gsc.c index d8c0ffb..d8c0ffb 100644 --- a/drivers/serial/8250_gsc.c +++ b/drivers/tty/serial/8250_gsc.c diff --git a/drivers/serial/8250_hp300.c b/drivers/tty/serial/8250_hp300.c index c13438c..c13438c 100644 --- a/drivers/serial/8250_hp300.c +++ b/drivers/tty/serial/8250_hp300.c diff --git a/drivers/serial/8250_hub6.c b/drivers/tty/serial/8250_hub6.c index 7609150..7609150 100644 --- a/drivers/serial/8250_hub6.c +++ b/drivers/tty/serial/8250_hub6.c diff --git a/drivers/serial/8250_mca.c b/drivers/tty/serial/8250_mca.c index d10be94..d10be94 100644 --- a/drivers/serial/8250_mca.c +++ b/drivers/tty/serial/8250_mca.c diff --git a/drivers/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c index 8b8930f..8b8930f 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/tty/serial/8250_pci.c diff --git a/drivers/serial/8250_pnp.c b/drivers/tty/serial/8250_pnp.c index 4822cb5..4822cb5 100644 --- a/drivers/serial/8250_pnp.c +++ b/drivers/tty/serial/8250_pnp.c diff --git a/drivers/serial/Kconfig b/drivers/tty/serial/Kconfig index c1df767..c1df767 100644 --- a/drivers/serial/Kconfig +++ b/drivers/tty/serial/Kconfig diff --git a/drivers/serial/Makefile b/drivers/tty/serial/Makefile index 8ea92e9..8ea92e9 100644 --- a/drivers/serial/Makefile +++ b/drivers/tty/serial/Makefile diff --git a/drivers/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c index f9b49b5..f9b49b5 100644 --- a/drivers/serial/altera_jtaguart.c +++ b/drivers/tty/serial/altera_jtaguart.c diff --git a/drivers/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c index 7212162..7212162 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/tty/serial/altera_uart.c diff --git a/drivers/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c index 2904aa0..2904aa0 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/tty/serial/amba-pl010.c diff --git a/drivers/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index e76d7d0..e76d7d0 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c diff --git a/drivers/serial/apbuart.c b/drivers/tty/serial/apbuart.c index 095a5d5..095a5d5 100644 --- a/drivers/serial/apbuart.c +++ b/drivers/tty/serial/apbuart.c diff --git a/drivers/serial/apbuart.h b/drivers/tty/serial/apbuart.h index 5faf87c..5faf87c 100644 --- a/drivers/serial/apbuart.h +++ b/drivers/tty/serial/apbuart.h diff --git a/drivers/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 2a1d52f..2a1d52f 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c index a1a0e55..a1a0e55 100644 --- a/drivers/serial/bcm63xx_uart.c +++ b/drivers/tty/serial/bcm63xx_uart.c diff --git a/drivers/serial/bfin_5xx.c b/drivers/tty/serial/bfin_5xx.c index e381b89..e381b89 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/tty/serial/bfin_5xx.c diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c index e95c524..e95c524 100644 --- a/drivers/serial/bfin_sport_uart.c +++ b/drivers/tty/serial/bfin_sport_uart.c diff --git a/drivers/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h index 6d06ce1..6d06ce1 100644 --- a/drivers/serial/bfin_sport_uart.h +++ b/drivers/tty/serial/bfin_sport_uart.h diff --git a/drivers/serial/clps711x.c b/drivers/tty/serial/clps711x.c index b6acd19..b6acd19 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/tty/serial/clps711x.c diff --git a/drivers/serial/cpm_uart/Makefile b/drivers/tty/serial/cpm_uart/Makefile index e072724..e072724 100644 --- a/drivers/serial/cpm_uart/Makefile +++ b/drivers/tty/serial/cpm_uart/Makefile diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h index b754dcf..b754dcf 100644 --- a/drivers/serial/cpm_uart/cpm_uart.h +++ b/drivers/tty/serial/cpm_uart/cpm_uart.h diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c index 8692ff9..8692ff9 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c index 3fc1d66..3fc1d66 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h index 10eecd6..10eecd6 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c index 814ac00..814ac00 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h index 7194c63..7194c63 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h diff --git a/drivers/serial/crisv10.c b/drivers/tty/serial/crisv10.c index bcc31f2..bcc31f2 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/tty/serial/crisv10.c diff --git a/drivers/serial/crisv10.h b/drivers/tty/serial/crisv10.h index ea0beb46..ea0beb46 100644 --- a/drivers/serial/crisv10.h +++ b/drivers/tty/serial/crisv10.h diff --git a/drivers/serial/dz.c b/drivers/tty/serial/dz.c index 57421d7..57421d7 100644 --- a/drivers/serial/dz.c +++ b/drivers/tty/serial/dz.c diff --git a/drivers/serial/dz.h b/drivers/tty/serial/dz.h index faf169e..faf169e 100644 --- a/drivers/serial/dz.h +++ b/drivers/tty/serial/dz.h diff --git a/drivers/serial/icom.c b/drivers/tty/serial/icom.c index 53a4682..53a4682 100644 --- a/drivers/serial/icom.c +++ b/drivers/tty/serial/icom.c diff --git a/drivers/serial/icom.h b/drivers/tty/serial/icom.h index c8029e0..c8029e0 100644 --- a/drivers/serial/icom.h +++ b/drivers/tty/serial/icom.h diff --git a/drivers/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index ab93763..ab93763 100644 --- a/drivers/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c diff --git a/drivers/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h index deb7b8d..deb7b8d 100644 --- a/drivers/serial/ifx6x60.h +++ b/drivers/tty/serial/ifx6x60.h diff --git a/drivers/serial/imx.c b/drivers/tty/serial/imx.c index dfcf4b1..dfcf4b1 100644 --- a/drivers/serial/imx.c +++ b/drivers/tty/serial/imx.c diff --git a/drivers/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c index ee43efc..ee43efc 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/tty/serial/ioc3_serial.c diff --git a/drivers/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c index fcfe826..fcfe826 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/tty/serial/ioc4_serial.c diff --git a/drivers/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c index ebff4a1..ebff4a1 100644 --- a/drivers/serial/ip22zilog.c +++ b/drivers/tty/serial/ip22zilog.c diff --git a/drivers/serial/ip22zilog.h b/drivers/tty/serial/ip22zilog.h index a59a9a8..a59a9a8 100644 --- a/drivers/serial/ip22zilog.h +++ b/drivers/tty/serial/ip22zilog.h diff --git a/drivers/serial/jsm/Makefile b/drivers/tty/serial/jsm/Makefile index e46b6e0..e46b6e0 100644 --- a/drivers/serial/jsm/Makefile +++ b/drivers/tty/serial/jsm/Makefile diff --git a/drivers/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h index 38a509c..38a509c 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/tty/serial/jsm/jsm.h diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c index 18f5484..18f5484 100644 --- a/drivers/serial/jsm/jsm_driver.c +++ b/drivers/tty/serial/jsm/jsm_driver.c diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c index 7960d96..7960d96 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/tty/serial/jsm/jsm_neo.c diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c index 7a4a914..7a4a914 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/tty/serial/jsm/jsm_tty.c diff --git a/drivers/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c index 25a8bc5..25a8bc5 100644 --- a/drivers/serial/kgdboc.c +++ b/drivers/tty/serial/kgdboc.c diff --git a/drivers/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c index bea5c21..bea5c21 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/tty/serial/m32r_sio.c diff --git a/drivers/serial/m32r_sio.h b/drivers/tty/serial/m32r_sio.h index e9b7e11..e9b7e11 100644 --- a/drivers/serial/m32r_sio.h +++ b/drivers/tty/serial/m32r_sio.h diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/tty/serial/m32r_sio_reg.h index 4671473..4671473 100644 --- a/drivers/serial/m32r_sio_reg.h +++ b/drivers/tty/serial/m32r_sio_reg.h diff --git a/drivers/serial/max3100.c b/drivers/tty/serial/max3100.c index beb1afa..beb1afa 100644 --- a/drivers/serial/max3100.c +++ b/drivers/tty/serial/max3100.c diff --git a/drivers/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c index a1fe304..a1fe304 100644 --- a/drivers/serial/max3107-aava.c +++ b/drivers/tty/serial/max3107-aava.c diff --git a/drivers/serial/max3107.c b/drivers/tty/serial/max3107.c index 910870e..910870e 100644 --- a/drivers/serial/max3107.c +++ b/drivers/tty/serial/max3107.c diff --git a/drivers/serial/max3107.h b/drivers/tty/serial/max3107.h index 7ab63239..7ab63239 100644 --- a/drivers/serial/max3107.h +++ b/drivers/tty/serial/max3107.h diff --git a/drivers/serial/mcf.c b/drivers/tty/serial/mcf.c index 3394b7c..3394b7c 100644 --- a/drivers/serial/mcf.c +++ b/drivers/tty/serial/mcf.c diff --git a/drivers/serial/mfd.c b/drivers/tty/serial/mfd.c index d40010a..d40010a 100644 --- a/drivers/serial/mfd.c +++ b/drivers/tty/serial/mfd.c diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c index 126ec7f..126ec7f 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/tty/serial/mpc52xx_uart.c diff --git a/drivers/serial/mpsc.c b/drivers/tty/serial/mpsc.c index 6a9c660..6a9c660 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/tty/serial/mpsc.c diff --git a/drivers/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c index b62857b..b62857b 100644 --- a/drivers/serial/mrst_max3110.c +++ b/drivers/tty/serial/mrst_max3110.c diff --git a/drivers/serial/mrst_max3110.h b/drivers/tty/serial/mrst_max3110.h index d1ef43a..d1ef43a 100644 --- a/drivers/serial/mrst_max3110.h +++ b/drivers/tty/serial/mrst_max3110.h diff --git a/drivers/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 8e43a7b..8e43a7b 100644 --- a/drivers/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c diff --git a/drivers/serial/msm_serial.h b/drivers/tty/serial/msm_serial.h index f6ca9ca..f6ca9ca 100644 --- a/drivers/serial/msm_serial.h +++ b/drivers/tty/serial/msm_serial.h diff --git a/drivers/serial/mux.c b/drivers/tty/serial/mux.c index 9711e06..9711e06 100644 --- a/drivers/serial/mux.c +++ b/drivers/tty/serial/mux.c diff --git a/drivers/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c index 7735c9f..7735c9f 100644 --- a/drivers/serial/netx-serial.c +++ b/drivers/tty/serial/netx-serial.c diff --git a/drivers/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c index de17367..de17367 100644 --- a/drivers/serial/nwpserial.c +++ b/drivers/tty/serial/nwpserial.c diff --git a/drivers/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 5c7abe4..5c7abe4 100644 --- a/drivers/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c diff --git a/drivers/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 7f2f010..7f2f010 100644 --- a/drivers/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c diff --git a/drivers/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 70a6145..70a6145 100644 --- a/drivers/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c diff --git a/drivers/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index 5b9cde7..5b9cde7 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c diff --git a/drivers/serial/pmac_zilog.h b/drivers/tty/serial/pmac_zilog.h index cbc34fb..cbc34fb 100644 --- a/drivers/serial/pmac_zilog.h +++ b/drivers/tty/serial/pmac_zilog.h diff --git a/drivers/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c index 0aa75a9..0aa75a9 100644 --- a/drivers/serial/pnx8xxx_uart.c +++ b/drivers/tty/serial/pnx8xxx_uart.c diff --git a/drivers/serial/pxa.c b/drivers/tty/serial/pxa.c index 1102a39..1102a39 100644 --- a/drivers/serial/pxa.c +++ b/drivers/tty/serial/pxa.c diff --git a/drivers/serial/s3c2400.c b/drivers/tty/serial/s3c2400.c index fed1a9a..fed1a9a 100644 --- a/drivers/serial/s3c2400.c +++ b/drivers/tty/serial/s3c2400.c diff --git a/drivers/serial/s3c2410.c b/drivers/tty/serial/s3c2410.c index 73f089d..73f089d 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/tty/serial/s3c2410.c diff --git a/drivers/serial/s3c2412.c b/drivers/tty/serial/s3c2412.c index 1700b1a..1700b1a 100644 --- a/drivers/serial/s3c2412.c +++ b/drivers/tty/serial/s3c2412.c diff --git a/drivers/serial/s3c2440.c b/drivers/tty/serial/s3c2440.c index 094cc39..094cc39 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/tty/serial/s3c2440.c diff --git a/drivers/serial/s3c24a0.c b/drivers/tty/serial/s3c24a0.c index fad6083..fad6083 100644 --- a/drivers/serial/s3c24a0.c +++ b/drivers/tty/serial/s3c24a0.c diff --git a/drivers/serial/s3c6400.c b/drivers/tty/serial/s3c6400.c index 4be92ab..4be92ab 100644 --- a/drivers/serial/s3c6400.c +++ b/drivers/tty/serial/s3c6400.c diff --git a/drivers/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c index 6ebccd7..6ebccd7 100644 --- a/drivers/serial/s5pv210.c +++ b/drivers/tty/serial/s5pv210.c diff --git a/drivers/serial/sa1100.c b/drivers/tty/serial/sa1100.c index 2199d81..2199d81 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/tty/serial/sa1100.c diff --git a/drivers/serial/samsung.c b/drivers/tty/serial/samsung.c index 2335eda..2335eda 100644 --- a/drivers/serial/samsung.c +++ b/drivers/tty/serial/samsung.c diff --git a/drivers/serial/samsung.h b/drivers/tty/serial/samsung.h index 0ac06a0..0ac06a0 100644 --- a/drivers/serial/samsung.h +++ b/drivers/tty/serial/samsung.h diff --git a/drivers/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c index a2f2b32..a2f2b32 100644 --- a/drivers/serial/sb1250-duart.c +++ b/drivers/tty/serial/sb1250-duart.c diff --git a/drivers/serial/sc26xx.c b/drivers/tty/serial/sc26xx.c index 75038ad..75038ad 100644 --- a/drivers/serial/sc26xx.c +++ b/drivers/tty/serial/sc26xx.c diff --git a/drivers/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 460a72d..460a72d 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c diff --git a/drivers/serial/serial_cs.c b/drivers/tty/serial/serial_cs.c index 93760b2..93760b2 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/tty/serial/serial_cs.c diff --git a/drivers/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c index b196202..b196202 100644 --- a/drivers/serial/serial_ks8695.c +++ b/drivers/tty/serial/serial_ks8695.c diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/tty/serial/serial_lh7a40x.c index ea74470..ea74470 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/tty/serial/serial_lh7a40x.c diff --git a/drivers/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c index c50e9fb..c50e9fb 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/tty/serial/serial_txx9.c diff --git a/drivers/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 92c91c8..92c91c8 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c diff --git a/drivers/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h index b223d6c..b223d6c 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/tty/serial/sh-sci.h diff --git a/drivers/serial/sn_console.c b/drivers/tty/serial/sn_console.c index cff9a30..cff9a30 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/tty/serial/sn_console.c diff --git a/drivers/serial/suncore.c b/drivers/tty/serial/suncore.c index 6381a02..6381a02 100644 --- a/drivers/serial/suncore.c +++ b/drivers/tty/serial/suncore.c diff --git a/drivers/serial/suncore.h b/drivers/tty/serial/suncore.h index db20579..db20579 100644 --- a/drivers/serial/suncore.h +++ b/drivers/tty/serial/suncore.h diff --git a/drivers/serial/sunhv.c b/drivers/tty/serial/sunhv.c index c901486..c901486 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/tty/serial/sunhv.c diff --git a/drivers/serial/sunsab.c b/drivers/tty/serial/sunsab.c index 5b246b1..5b246b1 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/tty/serial/sunsab.c diff --git a/drivers/serial/sunsab.h b/drivers/tty/serial/sunsab.h index b78e1f7..b78e1f7 100644 --- a/drivers/serial/sunsab.h +++ b/drivers/tty/serial/sunsab.h diff --git a/drivers/serial/sunsu.c b/drivers/tty/serial/sunsu.c index 551ebfe..551ebfe 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/tty/serial/sunsu.c diff --git a/drivers/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c index c1967ac..c1967ac 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/tty/serial/sunzilog.c diff --git a/drivers/serial/sunzilog.h b/drivers/tty/serial/sunzilog.h index 5dec7b4..5dec7b4 100644 --- a/drivers/serial/sunzilog.h +++ b/drivers/tty/serial/sunzilog.h diff --git a/drivers/serial/timbuart.c b/drivers/tty/serial/timbuart.c index 1f36b7e..1f36b7e 100644 --- a/drivers/serial/timbuart.c +++ b/drivers/tty/serial/timbuart.c diff --git a/drivers/serial/timbuart.h b/drivers/tty/serial/timbuart.h index 7e56676..7e56676 100644 --- a/drivers/serial/timbuart.h +++ b/drivers/tty/serial/timbuart.h diff --git a/drivers/serial/uartlite.c b/drivers/tty/serial/uartlite.c index d2fce86..d2fce86 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/tty/serial/uartlite.c diff --git a/drivers/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index 3f4848e..3f4848e 100644 --- a/drivers/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c diff --git a/drivers/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c index 3beb6ab..3beb6ab 100644 --- a/drivers/serial/vr41xx_siu.c +++ b/drivers/tty/serial/vr41xx_siu.c diff --git a/drivers/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 322bf56..322bf56 100644 --- a/drivers/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c diff --git a/drivers/serial/zs.c b/drivers/tty/serial/zs.c index 1a7fd3e..1a7fd3e 100644 --- a/drivers/serial/zs.c +++ b/drivers/tty/serial/zs.c diff --git a/drivers/serial/zs.h b/drivers/tty/serial/zs.h index aa921b5..aa921b5 100644 --- a/drivers/serial/zs.h +++ b/drivers/tty/serial/zs.h |