Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

fc887b15 · Linus Torvalds <[email protected]> · 2011-01-20 16:39:23 -08:00

* '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/

Commit: fc887b15d935ead2a00aef5779a18034e7c69ee1
Parents: 466c1906 · df621252

Merge commit. Changes below are compared with the first parent: 466c1906.

Changes

140 files changed · +42 −41

File	Status	Add	Del	Content
MAINTAINERS	modified	+25	−25	View file
drivers/Makefile	modified	+1	−2	View file
drivers/char/Kconfig	modified	+1	−1	View file
drivers/char/Makefile	modified	+0	−13	View file
drivers/tty/Makefile	modified	+2	−0	View file
drivers/tty/hvc/Makefile	added	+13	−0	View file
drivers/char/hvc_beat.c → drivers/tty/hvc/hvc_beat.c	renamed	+0	−0	View file
drivers/char/hvc_console.c → drivers/tty/hvc/hvc_console.c	renamed	+0	−0	View file
drivers/char/hvc_console.h → drivers/tty/hvc/hvc_console.h	renamed	+0	−0	View file
drivers/char/hvc_dcc.c → drivers/tty/hvc/hvc_dcc.c	renamed	+0	−0	View file
drivers/char/hvc_irq.c → drivers/tty/hvc/hvc_irq.c	renamed	+0	−0	View file
drivers/char/hvc_iseries.c → drivers/tty/hvc/hvc_iseries.c	renamed	+0	−0	View file
drivers/char/hvc_iucv.c → drivers/tty/hvc/hvc_iucv.c	renamed	+0	−0	View file
drivers/char/hvc_rtas.c → drivers/tty/hvc/hvc_rtas.c	renamed	+0	−0	View file
drivers/char/hvc_tile.c → drivers/tty/hvc/hvc_tile.c	renamed	+0	−0	View file
drivers/char/hvc_udbg.c → drivers/tty/hvc/hvc_udbg.c	renamed	+0	−0	View file
drivers/char/hvc_vio.c → drivers/tty/hvc/hvc_vio.c	renamed	+0	−0	View file
drivers/char/hvc_xen.c → drivers/tty/hvc/hvc_xen.c	renamed	+0	−0	View file
drivers/char/hvcs.c → drivers/tty/hvc/hvcs.c	renamed	+0	−0	View file
drivers/char/hvsi.c → drivers/tty/hvc/hvsi.c	renamed	+0	−0	View file
drivers/char/virtio_console.c → drivers/tty/hvc/virtio_console.c	renamed	+0	−0	View file
drivers/serial/21285.c → drivers/tty/serial/21285.c	renamed	+0	−0	View file
drivers/serial/68328serial.c → drivers/tty/serial/68328serial.c	renamed	+0	−0	View file
drivers/serial/68328serial.h → drivers/tty/serial/68328serial.h	renamed	+0	−0	View file
drivers/serial/68360serial.c → drivers/tty/serial/68360serial.c	renamed	+0	−0	View file
drivers/serial/8250.c → drivers/tty/serial/8250.c	renamed	+0	−0	View file
drivers/serial/8250.h → drivers/tty/serial/8250.h	renamed	+0	−0	View file
drivers/serial/8250_accent.c → drivers/tty/serial/8250_accent.c	renamed	+0	−0	View file
drivers/serial/8250_acorn.c → drivers/tty/serial/8250_acorn.c	renamed	+0	−0	View file
drivers/serial/8250_boca.c → drivers/tty/serial/8250_boca.c	renamed	+0	−0	View file
drivers/serial/8250_early.c → drivers/tty/serial/8250_early.c	renamed	+0	−0	View file
drivers/serial/8250_exar_st16c554.c → drivers/tty/serial/8250_exar_st16c554.c	renamed	+0	−0	View file
drivers/serial/8250_fourport.c → drivers/tty/serial/8250_fourport.c	renamed	+0	−0	View file
drivers/serial/8250_gsc.c → drivers/tty/serial/8250_gsc.c	renamed	+0	−0	View file
drivers/serial/8250_hp300.c → drivers/tty/serial/8250_hp300.c	renamed	+0	−0	View file
drivers/serial/8250_hub6.c → drivers/tty/serial/8250_hub6.c	renamed	+0	−0	View file
drivers/serial/8250_mca.c → drivers/tty/serial/8250_mca.c	renamed	+0	−0	View file
drivers/serial/8250_pci.c → drivers/tty/serial/8250_pci.c	renamed	+0	−0	View file
drivers/serial/8250_pnp.c → drivers/tty/serial/8250_pnp.c	renamed	+0	−0	View file
drivers/serial/Kconfig → drivers/tty/serial/Kconfig	renamed	+0	−0	View file
drivers/serial/Makefile → drivers/tty/serial/Makefile	renamed	+0	−0	View file
drivers/serial/altera_jtaguart.c → drivers/tty/serial/altera_jtaguart.c	renamed	+0	−0	View file
drivers/serial/altera_uart.c → drivers/tty/serial/altera_uart.c	renamed	+0	−0	View file
drivers/serial/amba-pl010.c → drivers/tty/serial/amba-pl010.c	renamed	+0	−0	View file
drivers/serial/amba-pl011.c → drivers/tty/serial/amba-pl011.c	renamed	+0	−0	View file
drivers/serial/apbuart.c → drivers/tty/serial/apbuart.c	renamed	+0	−0	View file
drivers/serial/apbuart.h → drivers/tty/serial/apbuart.h	renamed	+0	−0	View file
drivers/serial/atmel_serial.c → drivers/tty/serial/atmel_serial.c	renamed	+0	−0	View file
drivers/serial/bcm63xx_uart.c → drivers/tty/serial/bcm63xx_uart.c	renamed	+0	−0	View file
drivers/serial/bfin_5xx.c → drivers/tty/serial/bfin_5xx.c	renamed	+0	−0	View file
drivers/serial/bfin_sport_uart.c → drivers/tty/serial/bfin_sport_uart.c	renamed	+0	−0	View file
drivers/serial/bfin_sport_uart.h → drivers/tty/serial/bfin_sport_uart.h	renamed	+0	−0	View file
drivers/serial/clps711x.c → drivers/tty/serial/clps711x.c	renamed	+0	−0	View file
drivers/serial/cpm_uart/Makefile → drivers/tty/serial/cpm_uart/Makefile	renamed	+0	−0	View file
drivers/serial/cpm_uart/cpm_uart.h → drivers/tty/serial/cpm_uart/cpm_uart.h	renamed	+0	−0	View file
drivers/serial/cpm_uart/cpm_uart_core.c → drivers/tty/serial/cpm_uart/cpm_uart_core.c	renamed	+0	−0	View file
drivers/serial/cpm_uart/cpm_uart_cpm1.c → drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c	renamed	+0	−0	View file
drivers/serial/cpm_uart/cpm_uart_cpm1.h → drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h	renamed	+0	−0	View file
drivers/serial/cpm_uart/cpm_uart_cpm2.c → drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c	renamed	+0	−0	View file
drivers/serial/cpm_uart/cpm_uart_cpm2.h → drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h	renamed	+0	−0	View file
drivers/serial/crisv10.c → drivers/tty/serial/crisv10.c	renamed	+0	−0	View file
drivers/serial/crisv10.h → drivers/tty/serial/crisv10.h	renamed	+0	−0	View file
drivers/serial/dz.c → drivers/tty/serial/dz.c	renamed	+0	−0	View file
drivers/serial/dz.h → drivers/tty/serial/dz.h	renamed	+0	−0	View file
drivers/serial/icom.c → drivers/tty/serial/icom.c	renamed	+0	−0	View file
drivers/serial/icom.h → drivers/tty/serial/icom.h	renamed	+0	−0	View file
drivers/serial/ifx6x60.c → drivers/tty/serial/ifx6x60.c	renamed	+0	−0	View file
drivers/serial/ifx6x60.h → drivers/tty/serial/ifx6x60.h	renamed	+0	−0	View file
drivers/serial/imx.c → drivers/tty/serial/imx.c	renamed	+0	−0	View file
drivers/serial/ioc3_serial.c → drivers/tty/serial/ioc3_serial.c	renamed	+0	−0	View file
drivers/serial/ioc4_serial.c → drivers/tty/serial/ioc4_serial.c	renamed	+0	−0	View file
drivers/serial/ip22zilog.c → drivers/tty/serial/ip22zilog.c	renamed	+0	−0	View file
drivers/serial/ip22zilog.h → drivers/tty/serial/ip22zilog.h	renamed	+0	−0	View file
drivers/serial/jsm/Makefile → drivers/tty/serial/jsm/Makefile	renamed	+0	−0	View file
drivers/serial/jsm/jsm.h → drivers/tty/serial/jsm/jsm.h	renamed	+0	−0	View file
drivers/serial/jsm/jsm_driver.c → drivers/tty/serial/jsm/jsm_driver.c	renamed	+0	−0	View file
drivers/serial/jsm/jsm_neo.c → drivers/tty/serial/jsm/jsm_neo.c	renamed	+0	−0	View file
drivers/serial/jsm/jsm_tty.c → drivers/tty/serial/jsm/jsm_tty.c	renamed	+0	−0	View file
drivers/serial/kgdboc.c → drivers/tty/serial/kgdboc.c	renamed	+0	−0	View file
drivers/serial/m32r_sio.c → drivers/tty/serial/m32r_sio.c	renamed	+0	−0	View file
drivers/serial/m32r_sio.h → drivers/tty/serial/m32r_sio.h	renamed	+0	−0	View file
drivers/serial/m32r_sio_reg.h → drivers/tty/serial/m32r_sio_reg.h	renamed	+0	−0	View file
drivers/serial/max3100.c → drivers/tty/serial/max3100.c	renamed	+0	−0	View file
drivers/serial/max3107-aava.c → drivers/tty/serial/max3107-aava.c	renamed	+0	−0	View file
drivers/serial/max3107.c → drivers/tty/serial/max3107.c	renamed	+0	−0	View file
drivers/serial/max3107.h → drivers/tty/serial/max3107.h	renamed	+0	−0	View file
drivers/serial/mcf.c → drivers/tty/serial/mcf.c	renamed	+0	−0	View file
drivers/serial/mfd.c → drivers/tty/serial/mfd.c	renamed	+0	−0	View file
drivers/serial/mpc52xx_uart.c → drivers/tty/serial/mpc52xx_uart.c	renamed	+0	−0	View file
drivers/serial/mpsc.c → drivers/tty/serial/mpsc.c	renamed	+0	−0	View file
drivers/serial/mrst_max3110.c → drivers/tty/serial/mrst_max3110.c	renamed	+0	−0	View file
drivers/serial/mrst_max3110.h → drivers/tty/serial/mrst_max3110.h	renamed	+0	−0	View file
drivers/serial/msm_serial.c → drivers/tty/serial/msm_serial.c	renamed	+0	−0	View file
drivers/serial/msm_serial.h → drivers/tty/serial/msm_serial.h	renamed	+0	−0	View file
drivers/serial/mux.c → drivers/tty/serial/mux.c	renamed	+0	−0	View file
drivers/serial/netx-serial.c → drivers/tty/serial/netx-serial.c	renamed	+0	−0	View file
drivers/serial/nwpserial.c → drivers/tty/serial/nwpserial.c	renamed	+0	−0	View file
drivers/serial/of_serial.c → drivers/tty/serial/of_serial.c	renamed	+0	−0	View file
drivers/serial/omap-serial.c → drivers/tty/serial/omap-serial.c	renamed	+0	−0	View file
drivers/serial/pch_uart.c → drivers/tty/serial/pch_uart.c	renamed	+0	−0	View file
drivers/serial/pmac_zilog.c → drivers/tty/serial/pmac_zilog.c	renamed	+0	−0	View file
drivers/serial/pmac_zilog.h → drivers/tty/serial/pmac_zilog.h	renamed	+0	−0	View file
drivers/serial/pnx8xxx_uart.c → drivers/tty/serial/pnx8xxx_uart.c	renamed	+0	−0	View file
drivers/serial/pxa.c → drivers/tty/serial/pxa.c	renamed	+0	−0	View file
drivers/serial/s3c2400.c → drivers/tty/serial/s3c2400.c	renamed	+0	−0	View file
drivers/serial/s3c2410.c → drivers/tty/serial/s3c2410.c	renamed	+0	−0	View file
drivers/serial/s3c2412.c → drivers/tty/serial/s3c2412.c	renamed	+0	−0	View file
drivers/serial/s3c2440.c → drivers/tty/serial/s3c2440.c	renamed	+0	−0	View file
drivers/serial/s3c24a0.c → drivers/tty/serial/s3c24a0.c	renamed	+0	−0	View file
drivers/serial/s3c6400.c → drivers/tty/serial/s3c6400.c	renamed	+0	−0	View file
drivers/serial/s5pv210.c → drivers/tty/serial/s5pv210.c	renamed	+0	−0	View file
drivers/serial/sa1100.c → drivers/tty/serial/sa1100.c	renamed	+0	−0	View file
drivers/serial/samsung.c → drivers/tty/serial/samsung.c	renamed	+0	−0	View file
drivers/serial/samsung.h → drivers/tty/serial/samsung.h	renamed	+0	−0	View file
drivers/serial/sb1250-duart.c → drivers/tty/serial/sb1250-duart.c	renamed	+0	−0	View file
drivers/serial/sc26xx.c → drivers/tty/serial/sc26xx.c	renamed	+0	−0	View file
drivers/serial/serial_core.c → drivers/tty/serial/serial_core.c	renamed	+0	−0	View file
drivers/serial/serial_cs.c → drivers/tty/serial/serial_cs.c	renamed	+0	−0	View file
drivers/serial/serial_ks8695.c → drivers/tty/serial/serial_ks8695.c	renamed	+0	−0	View file
drivers/serial/serial_lh7a40x.c → drivers/tty/serial/serial_lh7a40x.c	renamed	+0	−0	View file
drivers/serial/serial_txx9.c → drivers/tty/serial/serial_txx9.c	renamed	+0	−0	View file
drivers/serial/sh-sci.c → drivers/tty/serial/sh-sci.c	renamed	+0	−0	View file
drivers/serial/sh-sci.h → drivers/tty/serial/sh-sci.h	renamed	+0	−0	View file
drivers/serial/sn_console.c → drivers/tty/serial/sn_console.c	renamed	+0	−0	View file
drivers/serial/suncore.c → drivers/tty/serial/suncore.c	renamed	+0	−0	View file
drivers/serial/suncore.h → drivers/tty/serial/suncore.h	renamed	+0	−0	View file
drivers/serial/sunhv.c → drivers/tty/serial/sunhv.c	renamed	+0	−0	View file
drivers/serial/sunsab.c → drivers/tty/serial/sunsab.c	renamed	+0	−0	View file
drivers/serial/sunsab.h → drivers/tty/serial/sunsab.h	renamed	+0	−0	View file
drivers/serial/sunsu.c → drivers/tty/serial/sunsu.c	renamed	+0	−0	View file
drivers/serial/sunzilog.c → drivers/tty/serial/sunzilog.c	renamed	+0	−0	View file
drivers/serial/sunzilog.h → drivers/tty/serial/sunzilog.h	renamed	+0	−0	View file
drivers/serial/timbuart.c → drivers/tty/serial/timbuart.c	renamed	+0	−0	View file
drivers/serial/timbuart.h → drivers/tty/serial/timbuart.h	renamed	+0	−0	View file
drivers/serial/uartlite.c → drivers/tty/serial/uartlite.c	renamed	+0	−0	View file
drivers/serial/ucc_uart.c → drivers/tty/serial/ucc_uart.c	renamed	+0	−0	View file
drivers/serial/vr41xx_siu.c → drivers/tty/serial/vr41xx_siu.c	renamed	+0	−0	View file
drivers/serial/vt8500_serial.c → drivers/tty/serial/vt8500_serial.c	renamed	+0	−0	View file
drivers/serial/zs.c → drivers/tty/serial/zs.c	renamed	+0	−0	View file
drivers/serial/zs.h → drivers/tty/serial/zs.h	renamed	+0	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 1af022e..2e14fd7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -162,7 +162,7 @@ L:	[email protected]
 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 <[email protected]>
 S:	Supported
-F:	drivers/serial/atmel_serial.c
+F:	drivers/tty/serial/atmel_serial.c
 
 ATMEL LCDFB DRIVER
 M:	Nicolas Ferre <[email protected]>
@@ -1412,7 +1412,7 @@ M:	Sonic Zhang <[email protected]>
 L:	[email protected]
 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 <[email protected]>
@@ -1877,7 +1877,7 @@ L:	[email protected]
 W:	http://developer.axis.com
 S:	Maintained
 F:	arch/cris/
-F:	drivers/serial/crisv10.*
+F:	drivers/tty/serial/crisv10.*
 
 CRYPTO API
 M:	Herbert Xu <[email protected]>
@@ -2216,7 +2216,7 @@ F:	drivers/net/wan/dscc4.c
 DZ DECSTATION DZ11 SERIAL DRIVER
 M:	"Maciej W. Rozycki" <[email protected]>
 S:	Maintained
-F:	drivers/serial/dz.*
+F:	drivers/tty/serial/dz.*
 
 EATA-DMA SCSI DRIVER
 M:	Michael Neuffer <[email protected]>
@@ -2643,7 +2643,7 @@ FREESCALE QUICC ENGINE UCC UART DRIVER
 M:	Timur Tabi <[email protected]>
 L:	[email protected]
 S:	Supported
-F:	drivers/serial/ucc_uart.c
+F:	drivers/tty/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
 M:	Timur Tabi <[email protected]>
@@ -3350,7 +3350,7 @@ IOC3 SERIAL DRIVER
 M:	Pat Gefre <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/serial/ioc3_serial.c
+F:	drivers/tty/serial/ioc3_serial.c
 
 IP MASQUERADING
 M:	Juanjo Ciarlante <[email protected]>
@@ -3527,7 +3527,7 @@ JSM Neo PCI based serial card
 M:	Breno Leitao <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/serial/jsm/
+F:	drivers/tty/serial/jsm/
 
 K10TEMP HARDWARE MONITORING DRIVER
 M:	Clemens Ladisch <[email protected]>
@@ -3677,7 +3677,7 @@ L:	[email protected]
 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 <[email protected]>
 L:	[email protected]
 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:	[email protected] (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:	[email protected]
 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 <[email protected]>
@@ -6124,8 +6124,8 @@ TTY LAYER
 M:	Greg Kroah-Hartman <[email protected]>
 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 <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/serial/uartlite.c
+F:	drivers/tty/serial/uartlite.c
 
 YAM DRIVER FOR AX.25
 M:	Jean-Paul Roubelat <[email protected]>
@@ -6916,7 +6916,7 @@ F:	drivers/media/video/zoran/
 ZS DECSTATION Z85C30 SERIAL DRIVER
 M:	"Maciej W. Rozycki" <[email protected]>
 S:	Maintained
-F:	drivers/serial/zs.*
+F:	drivers/tty/serial/zs.*
 
 GRE DEMULTIPLEXER DRIVER
 M:	Dmitry Kozlov <[email protected]>

drivers/Makefile

View file

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/

drivers/char/Kconfig

View file

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

drivers/char/Makefile

View file

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

drivers/tty/Makefile

View file

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/

drivers/tty/hvc/Makefile

View file

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

drivers/tty/hvc/hvc_beat.c

View file

diff --git a/drivers/char/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c
similarity index 100%
rename from drivers/char/hvc_beat.c
rename to drivers/tty/hvc/hvc_beat.c

drivers/tty/hvc/hvc_console.c

View file

diff --git a/drivers/char/hvc_console.c b/drivers/tty/hvc/hvc_console.c
similarity index 100%
rename from drivers/char/hvc_console.c
rename to drivers/tty/hvc/hvc_console.c

drivers/tty/hvc/hvc_console.h

View file

diff --git a/drivers/char/hvc_console.h b/drivers/tty/hvc/hvc_console.h
similarity index 100%
rename from drivers/char/hvc_console.h
rename to drivers/tty/hvc/hvc_console.h

drivers/tty/hvc/hvc_dcc.c

View file

diff --git a/drivers/char/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
similarity index 100%
rename from drivers/char/hvc_dcc.c
rename to drivers/tty/hvc/hvc_dcc.c

drivers/tty/hvc/hvc_irq.c

View file

diff --git a/drivers/char/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c
similarity index 100%
rename from drivers/char/hvc_irq.c
rename to drivers/tty/hvc/hvc_irq.c

drivers/tty/hvc/hvc_iseries.c

View file

diff --git a/drivers/char/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c
similarity index 100%
rename from drivers/char/hvc_iseries.c
rename to drivers/tty/hvc/hvc_iseries.c

drivers/tty/hvc/hvc_iucv.c

View file

diff --git a/drivers/char/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
similarity index 100%
rename from drivers/char/hvc_iucv.c
rename to drivers/tty/hvc/hvc_iucv.c

drivers/tty/hvc/hvc_rtas.c

View file

diff --git a/drivers/char/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
similarity index 100%
rename from drivers/char/hvc_rtas.c
rename to drivers/tty/hvc/hvc_rtas.c

drivers/tty/hvc/hvc_tile.c

View file

diff --git a/drivers/char/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
similarity index 100%
rename from drivers/char/hvc_tile.c
rename to drivers/tty/hvc/hvc_tile.c

drivers/tty/hvc/hvc_udbg.c

View file

diff --git a/drivers/char/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
similarity index 100%
rename from drivers/char/hvc_udbg.c
rename to drivers/tty/hvc/hvc_udbg.c

drivers/tty/hvc/hvc_vio.c

View file

diff --git a/drivers/char/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
similarity index 100%
rename from drivers/char/hvc_vio.c
rename to drivers/tty/hvc/hvc_vio.c

drivers/tty/hvc/hvc_xen.c

View file

diff --git a/drivers/char/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
similarity index 100%
rename from drivers/char/hvc_xen.c
rename to drivers/tty/hvc/hvc_xen.c

drivers/tty/hvc/hvcs.c

View file

diff --git a/drivers/char/hvcs.c b/drivers/tty/hvc/hvcs.c
similarity index 100%
rename from drivers/char/hvcs.c
rename to drivers/tty/hvc/hvcs.c

drivers/tty/hvc/hvsi.c

View file

diff --git a/drivers/char/hvsi.c b/drivers/tty/hvc/hvsi.c
similarity index 100%
rename from drivers/char/hvsi.c
rename to drivers/tty/hvc/hvsi.c

drivers/tty/hvc/virtio_console.c

View file

diff --git a/drivers/char/virtio_console.c b/drivers/tty/hvc/virtio_console.c
similarity index 100%
rename from drivers/char/virtio_console.c
rename to drivers/tty/hvc/virtio_console.c

drivers/tty/serial/21285.c

View file

diff --git a/drivers/serial/21285.c b/drivers/tty/serial/21285.c
similarity index 100%
rename from drivers/serial/21285.c
rename to drivers/tty/serial/21285.c

drivers/tty/serial/68328serial.c

View file

diff --git a/drivers/serial/68328serial.c b/drivers/tty/serial/68328serial.c
similarity index 100%
rename from drivers/serial/68328serial.c
rename to drivers/tty/serial/68328serial.c

drivers/tty/serial/68328serial.h

View file

diff --git a/drivers/serial/68328serial.h b/drivers/tty/serial/68328serial.h
similarity index 100%
rename from drivers/serial/68328serial.h
rename to drivers/tty/serial/68328serial.h

drivers/tty/serial/68360serial.c

View file

diff --git a/drivers/serial/68360serial.c b/drivers/tty/serial/68360serial.c
similarity index 100%
rename from drivers/serial/68360serial.c
rename to drivers/tty/serial/68360serial.c

drivers/tty/serial/8250.c

View file

diff --git a/drivers/serial/8250.c b/drivers/tty/serial/8250.c
similarity index 100%
rename from drivers/serial/8250.c
rename to drivers/tty/serial/8250.c

drivers/tty/serial/8250.h

View file

diff --git a/drivers/serial/8250.h b/drivers/tty/serial/8250.h
similarity index 100%
rename from drivers/serial/8250.h
rename to drivers/tty/serial/8250.h

drivers/tty/serial/8250_accent.c

View file

diff --git a/drivers/serial/8250_accent.c b/drivers/tty/serial/8250_accent.c
similarity index 100%
rename from drivers/serial/8250_accent.c
rename to drivers/tty/serial/8250_accent.c

drivers/tty/serial/8250_acorn.c

View file

diff --git a/drivers/serial/8250_acorn.c b/drivers/tty/serial/8250_acorn.c
similarity index 100%
rename from drivers/serial/8250_acorn.c
rename to drivers/tty/serial/8250_acorn.c

drivers/tty/serial/8250_boca.c

View file

diff --git a/drivers/serial/8250_boca.c b/drivers/tty/serial/8250_boca.c
similarity index 100%
rename from drivers/serial/8250_boca.c
rename to drivers/tty/serial/8250_boca.c

drivers/tty/serial/8250_early.c

View file

diff --git a/drivers/serial/8250_early.c b/drivers/tty/serial/8250_early.c
similarity index 100%
rename from drivers/serial/8250_early.c
rename to drivers/tty/serial/8250_early.c

drivers/tty/serial/8250_exar_st16c554.c

View file

diff --git a/drivers/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250_exar_st16c554.c
similarity index 100%
rename from drivers/serial/8250_exar_st16c554.c
rename to drivers/tty/serial/8250_exar_st16c554.c

drivers/tty/serial/8250_fourport.c

View file

diff --git a/drivers/serial/8250_fourport.c b/drivers/tty/serial/8250_fourport.c
similarity index 100%
rename from drivers/serial/8250_fourport.c
rename to drivers/tty/serial/8250_fourport.c

drivers/tty/serial/8250_gsc.c

View file

diff --git a/drivers/serial/8250_gsc.c b/drivers/tty/serial/8250_gsc.c
similarity index 100%
rename from drivers/serial/8250_gsc.c
rename to drivers/tty/serial/8250_gsc.c

drivers/tty/serial/8250_hp300.c

View file

diff --git a/drivers/serial/8250_hp300.c b/drivers/tty/serial/8250_hp300.c
similarity index 100%
rename from drivers/serial/8250_hp300.c
rename to drivers/tty/serial/8250_hp300.c

drivers/tty/serial/8250_hub6.c

View file

diff --git a/drivers/serial/8250_hub6.c b/drivers/tty/serial/8250_hub6.c
similarity index 100%
rename from drivers/serial/8250_hub6.c
rename to drivers/tty/serial/8250_hub6.c

drivers/tty/serial/8250_mca.c

View file

diff --git a/drivers/serial/8250_mca.c b/drivers/tty/serial/8250_mca.c
similarity index 100%
rename from drivers/serial/8250_mca.c
rename to drivers/tty/serial/8250_mca.c

drivers/tty/serial/8250_pci.c

View file

diff --git a/drivers/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
similarity index 100%
rename from drivers/serial/8250_pci.c
rename to drivers/tty/serial/8250_pci.c

drivers/tty/serial/8250_pnp.c

View file

diff --git a/drivers/serial/8250_pnp.c b/drivers/tty/serial/8250_pnp.c
similarity index 100%
rename from drivers/serial/8250_pnp.c
rename to drivers/tty/serial/8250_pnp.c

drivers/tty/serial/Kconfig

View file

diff --git a/drivers/serial/Kconfig b/drivers/tty/serial/Kconfig
similarity index 100%
rename from drivers/serial/Kconfig
rename to drivers/tty/serial/Kconfig

drivers/tty/serial/Makefile

View file

diff --git a/drivers/serial/Makefile b/drivers/tty/serial/Makefile
similarity index 100%
rename from drivers/serial/Makefile
rename to drivers/tty/serial/Makefile

drivers/tty/serial/altera_jtaguart.c

View file

diff --git a/drivers/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
similarity index 100%
rename from drivers/serial/altera_jtaguart.c
rename to drivers/tty/serial/altera_jtaguart.c

drivers/tty/serial/altera_uart.c

View file

diff --git a/drivers/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
similarity index 100%
rename from drivers/serial/altera_uart.c
rename to drivers/tty/serial/altera_uart.c

drivers/tty/serial/amba-pl010.c

View file

diff --git a/drivers/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
similarity index 100%
rename from drivers/serial/amba-pl010.c
rename to drivers/tty/serial/amba-pl010.c

drivers/tty/serial/amba-pl011.c

View file

diff --git a/drivers/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
similarity index 100%
rename from drivers/serial/amba-pl011.c
rename to drivers/tty/serial/amba-pl011.c

drivers/tty/serial/apbuart.c

View file

diff --git a/drivers/serial/apbuart.c b/drivers/tty/serial/apbuart.c
similarity index 100%
rename from drivers/serial/apbuart.c
rename to drivers/tty/serial/apbuart.c

drivers/tty/serial/apbuart.h

View file

diff --git a/drivers/serial/apbuart.h b/drivers/tty/serial/apbuart.h
similarity index 100%
rename from drivers/serial/apbuart.h
rename to drivers/tty/serial/apbuart.h

drivers/tty/serial/atmel_serial.c

View file

diff --git a/drivers/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
similarity index 100%
rename from drivers/serial/atmel_serial.c
rename to drivers/tty/serial/atmel_serial.c

drivers/tty/serial/bcm63xx_uart.c

View file

diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
similarity index 100%
rename from drivers/serial/bcm63xx_uart.c
rename to drivers/tty/serial/bcm63xx_uart.c

drivers/tty/serial/bfin_5xx.c

View file

diff --git a/drivers/serial/bfin_5xx.c b/drivers/tty/serial/bfin_5xx.c
similarity index 100%
rename from drivers/serial/bfin_5xx.c
rename to drivers/tty/serial/bfin_5xx.c

drivers/tty/serial/bfin_sport_uart.c

View file

diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
similarity index 100%
rename from drivers/serial/bfin_sport_uart.c
rename to drivers/tty/serial/bfin_sport_uart.c

drivers/tty/serial/bfin_sport_uart.h

View file

diff --git a/drivers/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h
similarity index 100%
rename from drivers/serial/bfin_sport_uart.h
rename to drivers/tty/serial/bfin_sport_uart.h

drivers/tty/serial/clps711x.c

View file

diff --git a/drivers/serial/clps711x.c b/drivers/tty/serial/clps711x.c
similarity index 100%
rename from drivers/serial/clps711x.c
rename to drivers/tty/serial/clps711x.c

drivers/tty/serial/cpm_uart/Makefile

View file

diff --git a/drivers/serial/cpm_uart/Makefile b/drivers/tty/serial/cpm_uart/Makefile
similarity index 100%
rename from drivers/serial/cpm_uart/Makefile
rename to drivers/tty/serial/cpm_uart/Makefile

drivers/tty/serial/cpm_uart/cpm_uart.h

View file

diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart.h
rename to drivers/tty/serial/cpm_uart/cpm_uart.h

drivers/tty/serial/cpm_uart/cpm_uart_core.c

View file

diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_core.c
rename to drivers/tty/serial/cpm_uart/cpm_uart_core.c

drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c

View file

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm1.c
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c

drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h

View file

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm1.h
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h

drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c

View file

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm2.c
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c

drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h

View file

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm2.h
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h

drivers/tty/serial/crisv10.c

View file

diff --git a/drivers/serial/crisv10.c b/drivers/tty/serial/crisv10.c
similarity index 100%
rename from drivers/serial/crisv10.c
rename to drivers/tty/serial/crisv10.c

drivers/tty/serial/crisv10.h

View file

diff --git a/drivers/serial/crisv10.h b/drivers/tty/serial/crisv10.h
similarity index 100%
rename from drivers/serial/crisv10.h
rename to drivers/tty/serial/crisv10.h

drivers/tty/serial/dz.c

View file

diff --git a/drivers/serial/dz.c b/drivers/tty/serial/dz.c
similarity index 100%
rename from drivers/serial/dz.c
rename to drivers/tty/serial/dz.c

drivers/tty/serial/dz.h

View file

diff --git a/drivers/serial/dz.h b/drivers/tty/serial/dz.h
similarity index 100%
rename from drivers/serial/dz.h
rename to drivers/tty/serial/dz.h

drivers/tty/serial/icom.c

View file

diff --git a/drivers/serial/icom.c b/drivers/tty/serial/icom.c
similarity index 100%
rename from drivers/serial/icom.c
rename to drivers/tty/serial/icom.c

drivers/tty/serial/icom.h

View file

diff --git a/drivers/serial/icom.h b/drivers/tty/serial/icom.h
similarity index 100%
rename from drivers/serial/icom.h
rename to drivers/tty/serial/icom.h

drivers/tty/serial/ifx6x60.c

View file

diff --git a/drivers/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
similarity index 100%
rename from drivers/serial/ifx6x60.c
rename to drivers/tty/serial/ifx6x60.c

drivers/tty/serial/ifx6x60.h

View file

diff --git a/drivers/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h
similarity index 100%
rename from drivers/serial/ifx6x60.h
rename to drivers/tty/serial/ifx6x60.h

drivers/tty/serial/imx.c

View file

diff --git a/drivers/serial/imx.c b/drivers/tty/serial/imx.c
similarity index 100%
rename from drivers/serial/imx.c
rename to drivers/tty/serial/imx.c

drivers/tty/serial/ioc3_serial.c

View file

diff --git a/drivers/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c
similarity index 100%
rename from drivers/serial/ioc3_serial.c
rename to drivers/tty/serial/ioc3_serial.c

drivers/tty/serial/ioc4_serial.c

View file

diff --git a/drivers/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
similarity index 100%
rename from drivers/serial/ioc4_serial.c
rename to drivers/tty/serial/ioc4_serial.c

drivers/tty/serial/ip22zilog.c

View file

diff --git a/drivers/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
similarity index 100%
rename from drivers/serial/ip22zilog.c
rename to drivers/tty/serial/ip22zilog.c

drivers/tty/serial/ip22zilog.h

View file

diff --git a/drivers/serial/ip22zilog.h b/drivers/tty/serial/ip22zilog.h
similarity index 100%
rename from drivers/serial/ip22zilog.h
rename to drivers/tty/serial/ip22zilog.h

drivers/tty/serial/jsm/Makefile

View file

diff --git a/drivers/serial/jsm/Makefile b/drivers/tty/serial/jsm/Makefile
similarity index 100%
rename from drivers/serial/jsm/Makefile
rename to drivers/tty/serial/jsm/Makefile

drivers/tty/serial/jsm/jsm.h

View file

diff --git a/drivers/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
similarity index 100%
rename from drivers/serial/jsm/jsm.h
rename to drivers/tty/serial/jsm/jsm.h

drivers/tty/serial/jsm/jsm_driver.c

View file

diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
similarity index 100%
rename from drivers/serial/jsm/jsm_driver.c
rename to drivers/tty/serial/jsm/jsm_driver.c

drivers/tty/serial/jsm/jsm_neo.c

View file

diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
similarity index 100%
rename from drivers/serial/jsm/jsm_neo.c
rename to drivers/tty/serial/jsm/jsm_neo.c

drivers/tty/serial/jsm/jsm_tty.c

View file

diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
similarity index 100%
rename from drivers/serial/jsm/jsm_tty.c
rename to drivers/tty/serial/jsm/jsm_tty.c

drivers/tty/serial/kgdboc.c

View file

diff --git a/drivers/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
similarity index 100%
rename from drivers/serial/kgdboc.c
rename to drivers/tty/serial/kgdboc.c

drivers/tty/serial/m32r_sio.c

View file

diff --git a/drivers/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
similarity index 100%
rename from drivers/serial/m32r_sio.c
rename to drivers/tty/serial/m32r_sio.c

drivers/tty/serial/m32r_sio.h

View file

diff --git a/drivers/serial/m32r_sio.h b/drivers/tty/serial/m32r_sio.h
similarity index 100%
rename from drivers/serial/m32r_sio.h
rename to drivers/tty/serial/m32r_sio.h

drivers/tty/serial/m32r_sio_reg.h

View file

diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/tty/serial/m32r_sio_reg.h
similarity index 100%
rename from drivers/serial/m32r_sio_reg.h
rename to drivers/tty/serial/m32r_sio_reg.h

drivers/tty/serial/max3100.c

View file

diff --git a/drivers/serial/max3100.c b/drivers/tty/serial/max3100.c
similarity index 100%
rename from drivers/serial/max3100.c
rename to drivers/tty/serial/max3100.c

drivers/tty/serial/max3107-aava.c

View file

diff --git a/drivers/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
similarity index 100%
rename from drivers/serial/max3107-aava.c
rename to drivers/tty/serial/max3107-aava.c

drivers/tty/serial/max3107.c

View file

diff --git a/drivers/serial/max3107.c b/drivers/tty/serial/max3107.c
similarity index 100%
rename from drivers/serial/max3107.c
rename to drivers/tty/serial/max3107.c

drivers/tty/serial/max3107.h

View file

diff --git a/drivers/serial/max3107.h b/drivers/tty/serial/max3107.h
similarity index 100%
rename from drivers/serial/max3107.h
rename to drivers/tty/serial/max3107.h

drivers/tty/serial/mcf.c

View file

diff --git a/drivers/serial/mcf.c b/drivers/tty/serial/mcf.c
similarity index 100%
rename from drivers/serial/mcf.c
rename to drivers/tty/serial/mcf.c

drivers/tty/serial/mfd.c

View file

diff --git a/drivers/serial/mfd.c b/drivers/tty/serial/mfd.c
similarity index 100%
rename from drivers/serial/mfd.c
rename to drivers/tty/serial/mfd.c

drivers/tty/serial/mpc52xx_uart.c

View file

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
similarity index 100%
rename from drivers/serial/mpc52xx_uart.c
rename to drivers/tty/serial/mpc52xx_uart.c

drivers/tty/serial/mpsc.c

View file

diff --git a/drivers/serial/mpsc.c b/drivers/tty/serial/mpsc.c
similarity index 100%
rename from drivers/serial/mpsc.c
rename to drivers/tty/serial/mpsc.c

drivers/tty/serial/mrst_max3110.c

View file

diff --git a/drivers/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
similarity index 100%
rename from drivers/serial/mrst_max3110.c
rename to drivers/tty/serial/mrst_max3110.c