TTY/serial driver movement for .38
Subsystems (23)
PATCH 1/1 TTY/serial driver movement for .38
As mentioned before in previous TTY git pull for .38, here's the big movement of the serial drivers into the drivers/tty/ subdirectory that needed to wait until after .38-rc1 was out.
It merely moves the hvc drivers to drivers/tty/hvc/ and the drivers/serial/ directory to drivers/tty/serial/ and fixes up the MAINTAINERS file to point to the proper locations of the files now that they have been moved.
This has been approved by all of the affected parties and has been in the -next tree for a week or so now, with no regressions.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/ tty-linus
Patches will be sent to the linux-kernel mailing list, if anyone wants to see them.
thanks,
greg k-h
------------
MAINTAINERS | 50 ++++++++++----------
drivers/Makefile | 3 +-
drivers/char/Kconfig | 2 +-
drivers/char/Makefile | 13 -----
drivers/tty/Makefile | 2 +
drivers/tty/hvc/Makefile | 13 +++++
drivers/{char => tty/hvc}/hvc_beat.c | 0
drivers/{char => tty/hvc}/hvc_console.c | 0
drivers/{char => tty/hvc}/hvc_console.h | 0
drivers/{char => tty/hvc}/hvc_dcc.c | 0
drivers/{char => tty/hvc}/hvc_irq.c | 0
drivers/{char => tty/hvc}/hvc_iseries.c | 0
drivers/{char => tty/hvc}/hvc_iucv.c | 0
drivers/{char => tty/hvc}/hvc_rtas.c | 0
drivers/{char => tty/hvc}/hvc_tile.c | 0
drivers/{char => tty/hvc}/hvc_udbg.c | 0
drivers/{char => tty/hvc}/hvc_vio.c | 0
drivers/{char => tty/hvc}/hvc_xen.c | 0
drivers/{char => tty/hvc}/hvcs.c | 0
drivers/{char => tty/hvc}/hvsi.c | 0
drivers/{char => tty/hvc}/virtio_console.c | 0
drivers/{ => tty}/serial/21285.c | 0
drivers/{ => tty}/serial/68328serial.c | 0
drivers/{ => tty}/serial/68328serial.h | 0
drivers/{ => tty}/serial/68360serial.c | 0
drivers/{ => tty}/serial/8250.c | 0
drivers/{ => tty}/serial/8250.h | 0
drivers/{ => tty}/serial/8250_accent.c | 0
drivers/{ => tty}/serial/8250_acorn.c | 0
drivers/{ => tty}/serial/8250_boca.c | 0
drivers/{ => tty}/serial/8250_early.c | 0
drivers/{ => tty}/serial/8250_exar_st16c554.c | 0
drivers/{ => tty}/serial/8250_fourport.c | 0
drivers/{ => tty}/serial/8250_gsc.c | 0
drivers/{ => tty}/serial/8250_hp300.c | 0
drivers/{ => tty}/serial/8250_hub6.c | 0
drivers/{ => tty}/serial/8250_mca.c | 0
drivers/{ => tty}/serial/8250_pci.c | 0
drivers/{ => tty}/serial/8250_pnp.c | 0
drivers/{ => tty}/serial/Kconfig | 0
drivers/{ => tty}/serial/Makefile | 0
drivers/{ => tty}/serial/altera_jtaguart.c | 0
drivers/{ => tty}/serial/altera_uart.c | 0
drivers/{ => tty}/serial/amba-pl010.c | 0
drivers/{ => tty}/serial/amba-pl011.c | 0
drivers/{ => tty}/serial/apbuart.c | 0
drivers/{ => tty}/serial/apbuart.h | 0
drivers/{ => tty}/serial/atmel_serial.c | 0
drivers/{ => tty}/serial/bcm63xx_uart.c | 0
drivers/{ => tty}/serial/bfin_5xx.c | 0
drivers/{ => tty}/serial/bfin_sport_uart.c | 0
drivers/{ => tty}/serial/bfin_sport_uart.h | 0
drivers/{ => tty}/serial/clps711x.c | 0
drivers/{ => tty}/serial/cpm_uart/Makefile | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart.h | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h | 0
drivers/{ => tty}/serial/crisv10.c | 0
drivers/{ => tty}/serial/crisv10.h | 0
drivers/{ => tty}/serial/dz.c | 0
drivers/{ => tty}/serial/dz.h | 0
drivers/{ => tty}/serial/icom.c | 0
drivers/{ => tty}/serial/icom.h | 0
drivers/{ => tty}/serial/ifx6x60.c | 0
drivers/{ => tty}/serial/ifx6x60.h | 0
drivers/{ => tty}/serial/imx.c | 0
drivers/{ => tty}/serial/ioc3_serial.c | 0
drivers/{ => tty}/serial/ioc4_serial.c | 0
drivers/{ => tty}/serial/ip22zilog.c | 0
drivers/{ => tty}/serial/ip22zilog.h | 0
drivers/{ => tty}/serial/jsm/Makefile | 0
drivers/{ => tty}/serial/jsm/jsm.h | 0
drivers/{ => tty}/serial/jsm/jsm_driver.c | 0
drivers/{ => tty}/serial/jsm/jsm_neo.c | 0
drivers/{ => tty}/serial/jsm/jsm_tty.c | 0
drivers/{ => tty}/serial/kgdboc.c | 0
drivers/{ => tty}/serial/m32r_sio.c | 0
drivers/{ => tty}/serial/m32r_sio.h | 0
drivers/{ => tty}/serial/m32r_sio_reg.h | 0
drivers/{ => tty}/serial/max3100.c | 0
drivers/{ => tty}/serial/max3107-aava.c | 0
drivers/{ => tty}/serial/max3107.c | 0
drivers/{ => tty}/serial/max3107.h | 0
drivers/{ => tty}/serial/mcf.c | 0
drivers/{ => tty}/serial/mfd.c | 0
drivers/{ => tty}/serial/mpc52xx_uart.c | 0
drivers/{ => tty}/serial/mpsc.c | 0
drivers/{ => tty}/serial/mrst_max3110.c | 0
drivers/{ => tty}/serial/mrst_max3110.h | 0
drivers/{ => tty}/serial/msm_serial.c | 0
drivers/{ => tty}/serial/msm_serial.h | 0
drivers/{ => tty}/serial/mux.c | 0
drivers/{ => tty}/serial/netx-serial.c | 0
drivers/{ => tty}/serial/nwpserial.c | 0
drivers/{ => tty}/serial/of_serial.c | 0
drivers/{ => tty}/serial/omap-serial.c | 0
drivers/{ => tty}/serial/pch_uart.c | 0
drivers/{ => tty}/serial/pmac_zilog.c | 0
drivers/{ => tty}/serial/pmac_zilog.h | 0
drivers/{ => tty}/serial/pnx8xxx_uart.c | 0
drivers/{ => tty}/serial/pxa.c | 0
drivers/{ => tty}/serial/s3c2400.c | 0
drivers/{ => tty}/serial/s3c2410.c | 0
drivers/{ => tty}/serial/s3c2412.c | 0
drivers/{ => tty}/serial/s3c2440.c | 0
drivers/{ => tty}/serial/s3c24a0.c | 0
drivers/{ => tty}/serial/s3c6400.c | 0
drivers/{ => tty}/serial/s5pv210.c | 0
drivers/{ => tty}/serial/sa1100.c | 0
drivers/{ => tty}/serial/samsung.c | 0
drivers/{ => tty}/serial/samsung.h | 0
drivers/{ => tty}/serial/sb1250-duart.c | 0
drivers/{ => tty}/serial/sc26xx.c | 0
drivers/{ => tty}/serial/serial_core.c | 0
drivers/{ => tty}/serial/serial_cs.c | 0
drivers/{ => tty}/serial/serial_ks8695.c | 0
drivers/{ => tty}/serial/serial_lh7a40x.c | 0
drivers/{ => tty}/serial/serial_txx9.c | 0
drivers/{ => tty}/serial/sh-sci.c | 0
drivers/{ => tty}/serial/sh-sci.h | 0
drivers/{ => tty}/serial/sn_console.c | 0
drivers/{ => tty}/serial/suncore.c | 0
drivers/{ => tty}/serial/suncore.h | 0
drivers/{ => tty}/serial/sunhv.c | 0
drivers/{ => tty}/serial/sunsab.c | 0
drivers/{ => tty}/serial/sunsab.h | 0
drivers/{ => tty}/serial/sunsu.c | 0
drivers/{ => tty}/serial/sunzilog.c | 0
drivers/{ => tty}/serial/sunzilog.h | 0
drivers/{ => tty}/serial/timbuart.c | 0
drivers/{ => tty}/serial/timbuart.h | 0
drivers/{ => tty}/serial/uartlite.c | 0
drivers/{ => tty}/serial/ucc_uart.c | 0
drivers/{ => tty}/serial/vr41xx_siu.c | 0
drivers/{ => tty}/serial/vt8500_serial.c | 0
drivers/{ => tty}/serial/zs.c | 0
drivers/{ => tty}/serial/zs.h | 0
140 files changed, 42 insertions(+), 41 deletions(-)
create mode 100644 drivers/tty/hvc/Makefile
rename drivers/{char => tty/hvc}/hvc_beat.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.h (100%)
rename drivers/{char => tty/hvc}/hvc_dcc.c (100%)
rename drivers/{char => tty/hvc}/hvc_irq.c (100%)
rename drivers/{char => tty/hvc}/hvc_iseries.c (100%)
rename drivers/{char => tty/hvc}/hvc_iucv.c (100%)
rename drivers/{char => tty/hvc}/hvc_rtas.c (100%)
rename drivers/{char => tty/hvc}/hvc_tile.c (100%)
rename drivers/{char => tty/hvc}/hvc_udbg.c (100%)
rename drivers/{char => tty/hvc}/hvc_vio.c (100%)
rename drivers/{char => tty/hvc}/hvc_xen.c (100%)
rename drivers/{char => tty/hvc}/hvcs.c (100%)
rename drivers/{char => tty/hvc}/hvsi.c (100%)
rename drivers/{char => tty/hvc}/virtio_console.c (100%)
rename drivers/{ => tty}/serial/21285.c (100%)
rename drivers/{ => tty}/serial/68328serial.c (100%)
rename drivers/{ => tty}/serial/68328serial.h (100%)
rename drivers/{ => tty}/serial/68360serial.c (100%)
rename drivers/{ => tty}/serial/8250.c (100%)
rename drivers/{ => tty}/serial/8250.h (100%)
rename drivers/{ => tty}/serial/8250_accent.c (100%)
rename drivers/{ => tty}/serial/8250_acorn.c (100%)
rename drivers/{ => tty}/serial/8250_boca.c (100%)
rename drivers/{ => tty}/serial/8250_early.c (100%)
rename drivers/{ => tty}/serial/8250_exar_st16c554.c (100%)
rename drivers/{ => tty}/serial/8250_fourport.c (100%)
rename drivers/{ => tty}/serial/8250_gsc.c (100%)
rename drivers/{ => tty}/serial/8250_hp300.c (100%)
rename drivers/{ => tty}/serial/8250_hub6.c (100%)
rename drivers/{ => tty}/serial/8250_mca.c (100%)
rename drivers/{ => tty}/serial/8250_pci.c (100%)
rename drivers/{ => tty}/serial/8250_pnp.c (100%)
rename drivers/{ => tty}/serial/Kconfig (100%)
rename drivers/{ => tty}/serial/Makefile (100%)
rename drivers/{ => tty}/serial/altera_jtaguart.c (100%)
rename drivers/{ => tty}/serial/altera_uart.c (100%)
rename drivers/{ => tty}/serial/amba-pl010.c (100%)
rename drivers/{ => tty}/serial/amba-pl011.c (100%)
rename drivers/{ => tty}/serial/apbuart.c (100%)
rename drivers/{ => tty}/serial/apbuart.h (100%)
rename drivers/{ => tty}/serial/atmel_serial.c (100%)
rename drivers/{ => tty}/serial/bcm63xx_uart.c (100%)
rename drivers/{ => tty}/serial/bfin_5xx.c (100%)
rename drivers/{ => tty}/serial/bfin_sport_uart.c (100%)
rename drivers/{ => tty}/serial/bfin_sport_uart.h (100%)
rename drivers/{ => tty}/serial/clps711x.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/Makefile (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart.h (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h (100%)
rename drivers/{ => tty}/serial/crisv10.c (100%)
rename drivers/{ => tty}/serial/crisv10.h (100%)
rename drivers/{ => tty}/serial/dz.c (100%)
rename drivers/{ => tty}/serial/dz.h (100%)
rename drivers/{ => tty}/serial/icom.c (100%)
rename drivers/{ => tty}/serial/icom.h (100%)
rename drivers/{ => tty}/serial/ifx6x60.c (100%)
rename drivers/{ => tty}/serial/ifx6x60.h (100%)
rename drivers/{ => tty}/serial/imx.c (100%)
rename drivers/{ => tty}/serial/ioc3_serial.c (100%)
rename drivers/{ => tty}/serial/ioc4_serial.c (100%)
rename drivers/{ => tty}/serial/ip22zilog.c (100%)
rename drivers/{ => tty}/serial/ip22zilog.h (100%)
rename drivers/{ => tty}/serial/jsm/Makefile (100%)
rename drivers/{ => tty}/serial/jsm/jsm.h (100%)
rename drivers/{ => tty}/serial/jsm/jsm_driver.c (100%)
rename drivers/{ => tty}/serial/jsm/jsm_neo.c (100%)
rename drivers/{ => tty}/serial/jsm/jsm_tty.c (100%)
rename drivers/{ => tty}/serial/kgdboc.c (100%)
rename drivers/{ => tty}/serial/m32r_sio.c (100%)
rename drivers/{ => tty}/serial/m32r_sio.h (100%)
rename drivers/{ => tty}/serial/m32r_sio_reg.h (100%)
rename drivers/{ => tty}/serial/max3100.c (100%)
rename drivers/{ => tty}/serial/max3107-aava.c (100%)
rename drivers/{ => tty}/serial/max3107.c (100%)
rename drivers/{ => tty}/serial/max3107.h (100%)
rename drivers/{ => tty}/serial/mcf.c (100%)
rename drivers/{ => tty}/serial/mfd.c (100%)
rename drivers/{ => tty}/serial/mpc52xx_uart.c (100%)
rename drivers/{ => tty}/serial/mpsc.c (100%)
rename drivers/{ => tty}/serial/mrst_max3110.c (100%)
rename drivers/{ => tty}/serial/mrst_max3110.h (100%)
rename drivers/{ => tty}/serial/msm_serial.c (100%)
rename drivers/{ => tty}/serial/msm_serial.h (100%)
rename drivers/{ => tty}/serial/mux.c (100%)
rename drivers/{ => tty}/serial/netx-serial.c (100%)
rename drivers/{ => tty}/serial/nwpserial.c (100%)
rename drivers/{ => tty}/serial/of_serial.c (100%)
rename drivers/{ => tty}/serial/omap-serial.c (100%)
rename drivers/{ => tty}/serial/pch_uart.c (100%)
rename drivers/{ => tty}/serial/pmac_zilog.c (100%)
rename drivers/{ => tty}/serial/pmac_zilog.h (100%)
rename drivers/{ => tty}/serial/pnx8xxx_uart.c (100%)
rename drivers/{ => tty}/serial/pxa.c (100%)
rename drivers/{ => tty}/serial/s3c2400.c (100%)
rename drivers/{ => tty}/serial/s3c2410.c (100%)
rename drivers/{ => tty}/serial/s3c2412.c (100%)
rename drivers/{ => tty}/serial/s3c2440.c (100%)
rename drivers/{ => tty}/serial/s3c24a0.c (100%)
rename drivers/{ => tty}/serial/s3c6400.c (100%)
rename drivers/{ => tty}/serial/s5pv210.c (100%)
rename drivers/{ => tty}/serial/sa1100.c (100%)
rename drivers/{ => tty}/serial/samsung.c (100%)
rename drivers/{ => tty}/serial/samsung.h (100%)
rename drivers/{ => tty}/serial/sb1250-duart.c (100%)
rename drivers/{ => tty}/serial/sc26xx.c (100%)
rename drivers/{ => tty}/serial/serial_core.c (100%)
rename drivers/{ => tty}/serial/serial_cs.c (100%)
rename drivers/{ => tty}/serial/serial_ks8695.c (100%)
rename drivers/{ => tty}/serial/serial_lh7a40x.c (100%)
rename drivers/{ => tty}/serial/serial_txx9.c (100%)
rename drivers/{ => tty}/serial/sh-sci.c (100%)
rename drivers/{ => tty}/serial/sh-sci.h (100%)
rename drivers/{ => tty}/serial/sn_console.c (100%)
rename drivers/{ => tty}/serial/suncore.c (100%)
rename drivers/{ => tty}/serial/suncore.h (100%)
rename drivers/{ => tty}/serial/sunhv.c (100%)
rename drivers/{ => tty}/serial/sunsab.c (100%)
rename drivers/{ => tty}/serial/sunsab.h (100%)
rename drivers/{ => tty}/serial/sunsu.c (100%)
rename drivers/{ => tty}/serial/sunzilog.c (100%)
rename drivers/{ => tty}/serial/sunzilog.h (100%)
rename drivers/{ => tty}/serial/timbuart.c (100%)
rename drivers/{ => tty}/serial/timbuart.h (100%)
rename drivers/{ => tty}/serial/uartlite.c (100%)
rename drivers/{ => tty}/serial/ucc_uart.c (100%)
rename drivers/{ => tty}/serial/vr41xx_siu.c (100%)
rename drivers/{ => tty}/serial/vt8500_serial.c (100%)
rename drivers/{ => tty}/serial/zs.c (100%)
rename drivers/{ => tty}/serial/zs.h (100%)---------------
Greg Kroah-Hartman (3):
tty: move hvc drivers to drivers/tty/hvc/
tty: move drivers/serial/ to drivers/tty/serial/
tty: update MAINTAINERS file due to driver movement
PATCH 1/3 tty: move hvc drivers to drivers/tty/hvc/
As requested by Arnd Bergmann, the hvc drivers are now moved to the drivers/tty/hvc/ directory. The virtio_console.c driver was also moved, as it required the hvc_console.h file to be able to be built, and it really is a hvc driver.
---
drivers/char/Makefile | 13 -------------
drivers/tty/Makefile | 1 +
drivers/tty/hvc/Makefile | 13 +++++++++++++
drivers/{char => tty/hvc}/hvc_beat.c | 0
drivers/{char => tty/hvc}/hvc_console.c | 0
drivers/{char => tty/hvc}/hvc_console.h | 0
drivers/{char => tty/hvc}/hvc_dcc.c | 0
drivers/{char => tty/hvc}/hvc_irq.c | 0
drivers/{char => tty/hvc}/hvc_iseries.c | 0
drivers/{char => tty/hvc}/hvc_iucv.c | 0
drivers/{char => tty/hvc}/hvc_rtas.c | 0
drivers/{char => tty/hvc}/hvc_tile.c | 0
drivers/{char => tty/hvc}/hvc_udbg.c | 0
drivers/{char => tty/hvc}/hvc_vio.c | 0
drivers/{char => tty/hvc}/hvc_xen.c | 0
drivers/{char => tty/hvc}/hvcs.c | 0
drivers/{char => tty/hvc}/hvsi.c | 0
drivers/{char => tty/hvc}/virtio_console.c | 0
18 files changed, 14 insertions(+), 13 deletions(-)
create mode 100644 drivers/tty/hvc/Makefile
rename drivers/{char => tty/hvc}/hvc_beat.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.h (100%)
rename drivers/{char => tty/hvc}/hvc_dcc.c (100%)
rename drivers/{char => tty/hvc}/hvc_irq.c (100%)
rename drivers/{char => tty/hvc}/hvc_iseries.c (100%)
rename drivers/{char => tty/hvc}/hvc_iucv.c (100%)
rename drivers/{char => tty/hvc}/hvc_rtas.c (100%)
rename drivers/{char => tty/hvc}/hvc_tile.c (100%)
rename drivers/{char => tty/hvc}/hvc_udbg.c (100%)
rename drivers/{char => tty/hvc}/hvc_vio.c (100%)
rename drivers/{char => tty/hvc}/hvc_xen.c (100%)
rename drivers/{char => tty/hvc}/hvcs.c (100%)
rename drivers/{char => tty/hvc}/hvsi.c (100%)
rename drivers/{char => tty/hvc}/virtio_console.c (100%)drivers/char/Makefile +0 -13
@@ -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 +1 -0
@@ -9,3 +9,4 @@ obj-$(CONFIG_N_GSM) += n_gsm.o obj-$(CONFIG_R3964) += n_r3964.o obj-y += vt/ +obj-$(CONFIG_HVC_DRIVER) += hvc/
drivers/tty/hvc/Makefile new file +13 -0
@@ -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 renamed from drivers/char/hvc_beat.c +0 -0
drivers/tty/hvc/hvc_console.c renamed from drivers/char/hvc_console.c +0 -0
drivers/tty/hvc/hvc_console.h renamed from drivers/char/hvc_console.h +0 -0
drivers/tty/hvc/hvc_dcc.c renamed from drivers/char/hvc_dcc.c +0 -0
drivers/tty/hvc/hvc_irq.c renamed from drivers/char/hvc_irq.c +0 -0
drivers/tty/hvc/hvc_iseries.c renamed from drivers/char/hvc_iseries.c +0 -0
drivers/tty/hvc/hvc_iucv.c renamed from drivers/char/hvc_iucv.c +0 -0
drivers/tty/hvc/hvc_rtas.c renamed from drivers/char/hvc_rtas.c +0 -0
drivers/tty/hvc/hvc_tile.c renamed from drivers/char/hvc_tile.c +0 -0
drivers/tty/hvc/hvc_udbg.c renamed from drivers/char/hvc_udbg.c +0 -0
drivers/tty/hvc/hvc_vio.c renamed from drivers/char/hvc_vio.c +0 -0
drivers/tty/hvc/hvc_xen.c renamed from drivers/char/hvc_xen.c +0 -0
drivers/tty/hvc/hvcs.c renamed from drivers/char/hvcs.c +0 -0
drivers/tty/hvc/hvsi.c renamed from drivers/char/hvsi.c +0 -0
drivers/tty/hvc/virtio_console.c renamed from drivers/char/virtio_console.c +0 -0
Signature · 1 line
1.7.1
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
Quoted 8 lines · On Thursday 20 January 2011 19:03:43 Greg Kroah-Hartman wrote:
As requested by Arnd Bergmann, the hvc drivers are now moved to the
drivers/tty/hvc/directory. Thevirtio_console.cdriver was also moved, as it required thehvc_console.hfile to be able to be built, and it really is a hvc driver.Cc Arnd Bergmann <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
In reply to Greg Kroah-HartmanQuoted 4 lines · Greg Kroah-Hartman
As requested by Arnd Bergmann, the hvc drivers are now moved to the
drivers/tty/hvc/directory. Thevirtio_console.cdriver was also moved, as it required thehvc_console.hfile to be able to be built, and it really is a hvc driver.
I just saw this now as a result of this patch entering mainline. I would have liked to be CC'ed to the patches. Also, I don't like the move of the virtio_console.c file to drivers/tty/hvc. virtio_console.c is not only an hvc driver; one of its functions is to hook some ports to hvc, but it's mostly a generic driver these days.
(I also note the MAINTAINERS entry was ignored and not updated in the 3rd patch of this series.)
Can you please move it back?
I could perhaps think of a way of splitting the file so the hvc bits can be moved to drivers/tty/hvc/ and having the core stay in drivers/char/, but that'll have to wait for the next cycle.
Amit
Arnd Bergmann
maintainerRe: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
Quoted 11 lines · On Thursday 27 January 2011 19:29:44 Amit Shah wrote:
Quoted 4 lines · Greg Kroah-Hartman
As requested by Arnd Bergmann, the hvc drivers are now moved to the
drivers/tty/hvc/directory. Thevirtio_console.cdriver was also moved, as it required thehvc_console.hfile to be able to be built, and it really is a hvc driver.I just saw this now as a result of this patch entering mainline. I would have liked to be CC'ed to the patches. Also, I don't like the move of the
virtio_console.cfile todrivers/tty/hvc.virtio_console.cis not only an hvc driver; one of its functions is to hook some ports to hvc, but it's mostly a generic driver these days.
Sorry about this, the idea to move this file was mine and my original patch did this as well. I remembered the code from when it was a simple console driver based on hvc and never noticed that it had evolved into a generic host/guest communication stack.
Quoted 1 line
Can you please move it back?
No objection from me here in general, though as Greg writes above, it's a bit ugly when hvc_console.h is in a different directory.
Quoted 3 lines
I could perhaps think of a way of splitting the file so the hvc bits can be moved to
drivers/tty/hvc/and having the core stay indrivers/char/, but that'll have to wait for the next cycle.
I think that's a really good idea. The main reason for moving the tty drivers from drivers/char to drivers/tty was to separate the everything related to tty from everything else. The common part should IMHO then not be named "console", "tty" os similar but indicate that it's more generic than that. Maybe virtio-pipe?
Arnd
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
Quoted 18 lines · Arnd Bergmann
Quoted 11 lines · On Thursday 27 January 2011 19:29:44 Amit Shah wrote:
Quoted 4 lines · Greg Kroah-Hartman
As requested by Arnd Bergmann, the hvc drivers are now moved to the
drivers/tty/hvc/directory. Thevirtio_console.cdriver was also moved, as it required thehvc_console.hfile to be able to be built, and it really is a hvc driver.I just saw this now as a result of this patch entering mainline. I would have liked to be CC'ed to the patches. Also, I don't like the move of the
virtio_console.cfile todrivers/tty/hvc.virtio_console.cis not only an hvc driver; one of its functions is to hook some ports to hvc, but it's mostly a generic driver these days.Sorry about this, the idea to move this file was mine and my original patch did this as well. I remembered the code from when it was a simple console driver based on hvc and never noticed that it had evolved into a generic host/guest communication stack.
Quoted 4 lines
Quoted 1 line
Can you please move it back?
No objection from me here in general, though as Greg writes above, it's a bit ugly when
hvc_console.his in a different directory.
Greg, can you do this please? (A way to do it with preservig git history of the file would be great as well, but I think only a revert will do that?)
Quoted 9 lines
Quoted 3 lines
I could perhaps think of a way of splitting the file so the hvc bits can be moved to
drivers/tty/hvc/and having the core stay indrivers/char/, but that'll have to wait for the next cycle.I think that's a really good idea. The main reason for moving the tty drivers from
drivers/chartodrivers/ttywas to separate the everything related to tty from everything else. The common part should IMHO then not be named "console", "tty" os similar but indicate that it's more generic than that. Maybe virtio-pipe?
Rusty has suggested virtio-ports in the past.
Amit
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
Quoted 19 lines · Amit Shah
Quoted 18 lines · Arnd Bergmann
Quoted 11 lines · On Thursday 27 January 2011 19:29:44 Amit Shah wrote:
Quoted 4 lines · Greg Kroah-Hartman
As requested by Arnd Bergmann, the hvc drivers are now moved to the
drivers/tty/hvc/directory. Thevirtio_console.cdriver was also moved, as it required thehvc_console.hfile to be able to be built, and it really is a hvc driver.I just saw this now as a result of this patch entering mainline. I would have liked to be CC'ed to the patches. Also, I don't like the move of the
virtio_console.cfile todrivers/tty/hvc.virtio_console.cis not only an hvc driver; one of its functions is to hook some ports to hvc, but it's mostly a generic driver these days.Sorry about this, the idea to move this file was mine and my original patch did this as well. I remembered the code from when it was a simple console driver based on hvc and never noticed that it had evolved into a generic host/guest communication stack.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Can you please move it back?
No objection from me here in general, though as Greg writes above, it's a bit ugly when
hvc_console.his in a different directory.Greg, can you do this please? (A way to do it with preservig git history of the file would be great as well, but I think only a revert will do that?)
So just move the one file, virtio_console.c? If so, yes, I can move it back.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I could perhaps think of a way of splitting the file so the hvc bits can be moved to
drivers/tty/hvc/and having the core stay indrivers/char/, but that'll have to wait for the next cycle.
That would be great, care to send me those patches now so I can queue it up for .39?
thanks,
greg k-h
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
Quoted 10 lines · Greg KH
Quoted 10 lines
Quoted 9 lines
Sorry about this, the idea to move this file was mine and my original patch did this as well. I remembered the code from when it was a simple console driver based on hvc and never noticed that it had evolved into a generic host/guest communication stack.
Quoted 1 line
Can you please move it back?
No objection from me here in general, though as Greg writes above, it's a bit ugly when
hvc_console.his in a different directory.
Quoted 6 lines
Quoted 3 lines
Greg, can you do this please? (A way to do it with preservig git history of the file would be great as well, but I think only a revert will do that?)
So just move the one file,
virtio_console.c? If so, yes, I can move it back.
Yes, just the one file.
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I could perhaps think of a way of splitting the file so the hvc bits can be moved to
drivers/tty/hvc/and having the core stay indrivers/char/, but that'll have to wait for the next cycle.That would be great, care to send me those patches now so I can queue it up for .39?
It was just a thought; I don't have patches yet. I'll send them your way once they're ready.
Thanks,
Amit
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
Quoted 11 lines · Amit Shah
Quoted 10 lines · Greg KH
Quoted 10 lines
Quoted 9 lines
Sorry about this, the idea to move this file was mine and my original patch did this as well. I remembered the code from when it was a simple console driver based on hvc and never noticed that it had evolved into a generic host/guest communication stack.
Quoted 1 line
Can you please move it back?
No objection from me here in general, though as Greg writes above, it's a bit ugly when
hvc_console.his in a different directory.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Greg, can you do this please? (A way to do it with preservig git history of the file would be great as well, but I think only a revert will do that?)
So just move the one file,
virtio_console.c? If so, yes, I can move it back.Yes, just the one file.
Ok, I'll queue that up later today.
thanks,
greg k-h
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
In reply to Amit ShahQuoted 24 lines · Amit Shah
Quoted 10 lines · Greg KH
Quoted 10 lines
Quoted 9 lines
Sorry about this, the idea to move this file was mine and my original patch did this as well. I remembered the code from when it was a simple console driver based on hvc and never noticed that it had evolved into a generic host/guest communication stack.
Quoted 1 line
Can you please move it back?
No objection from me here in general, though as Greg writes above, it's a bit ugly when
hvc_console.his in a different directory.Quoted 6 lines
Quoted 3 lines
Greg, can you do this please? (A way to do it with preservig git history of the file would be great as well, but I think only a revert will do that?)
So just move the one file,
virtio_console.c? If so, yes, I can move it back.Yes, just the one file.
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I could perhaps think of a way of splitting the file so the hvc bits can be moved to
drivers/tty/hvc/and having the core stay indrivers/char/, but that'll have to wait for the next cycle.
Quoted 5 lines
Quoted 2 lines
That would be great, care to send me those patches now so I can queue it up for .39?
It was just a thought; I don't have patches yet. I'll send them your way once they're ready.
Actually, can you send me the patch to do this rename back now? I can't test the build to verify that I got it correct, and I'd like to properly credit you with it as well.
thanks,
greg k-h
Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
Quoted 28 lines · Greg KH
Quoted 27 lines · Amit Shah
Quoted 10 lines · Greg KH
Quoted 10 lines
Quoted 9 lines
Sorry about this, the idea to move this file was mine and my original patch did this as well. I remembered the code from when it was a simple console driver based on hvc and never noticed that it had evolved into a generic host/guest communication stack.
Quoted 1 line
Can you please move it back?
No objection from me here in general, though as Greg writes above, it's a bit ugly when
hvc_console.his in a different directory.Quoted 6 lines
Quoted 3 lines
Greg, can you do this please? (A way to do it with preservig git history of the file would be great as well, but I think only a revert will do that?)
So just move the one file,
virtio_console.c? If so, yes, I can move it back.Yes, just the one file.
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I could perhaps think of a way of splitting the file so the hvc bits can be moved to
drivers/tty/hvc/and having the core stay indrivers/char/, but that'll have to wait for the next cycle.That would be great, care to send me those patches now so I can queue it up for .39?
Quoted 6 lines
Quoted 2 lines
It was just a thought; I don't have patches yet. I'll send them your way once they're ready.
Actually, can you send me the patch to do this rename back now? I can't test the build to verify that I got it correct, and I'd like to properly credit you with it as well.
OK; I'll do that.
Amit
PATCH 1/1 virtio: console: Move file back to drivers/char/
In reply to Greg KHCommit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c to drivers/tty/hvc/ under the perception of this being an hvc driver. It was such once, but these days it has generic communication capabilities as well, so move it to drivers/char/.
In the future, the hvc part from this file can be split off and moved under drivers/tty/hvc/.
---
drivers/char/Makefile | 1 +
drivers/{tty/hvc => char}/virtio_console.c | 2 +-
drivers/tty/hvc/Makefile | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/{tty/hvc => char}/virtio_console.c (99%)drivers/char/Makefile +1 -0
@@ -30,6 +30,7 @@ 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_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
drivers/char/virtio_console.c renamed from drivers/tty/hvc/virtio_console.c +1 -1
@@ -31,7 +31,7 @@#include <linux/virtio_console.h> #include <linux/wait.h> #include <linux/workqueue.h> -#include "hvc_console.h" +#include "../tty/hvc/hvc_console.h" /* * This is a global struct for storing common data for all the devices
drivers/tty/hvc/Makefile +0 -1
@@ -10,4 +10,3 @@ 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
Signature · 1 line
1.7.3.5
PATCH 1/1 virtio: console: Move file back to drivers/char/
In reply to Greg KHCommit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c to drivers/tty/hvc/ under the perception of this being an hvc driver. It was such once, but these days it has generic communication capabilities as well, so move it to drivers/char/.
In the future, the hvc part from this file can be split off and moved under drivers/tty/hvc/.
---
drivers/char/Makefile | 1 +
drivers/{tty/hvc => char}/virtio_console.c | 2 +-
drivers/tty/hvc/Makefile | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/{tty/hvc => char}/virtio_console.c (99%)drivers/char/Makefile +1 -0
@@ -30,6 +30,7 @@ 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_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
drivers/char/virtio_console.c renamed from drivers/tty/hvc/virtio_console.c +1 -1
@@ -31,7 +31,7 @@#include <linux/virtio_console.h> #include <linux/wait.h> #include <linux/workqueue.h> -#include "hvc_console.h" +#include "../tty/hvc/hvc_console.h" /* * This is a global struct for storing common data for all the devices
drivers/tty/hvc/Makefile +0 -1
@@ -10,4 +10,3 @@ 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
Signature · 1 line
1.7.3.5
Re: [PATCH] virtio: console: Move file back to drivers/char/
Quoted 5 lines · Amit Shah
Commit
728674a7e466628df2aeec6d11a2ae1ef968fb67movedvirtio_console.ctodrivers/tty/hvc/under the perception of this being an hvc driver. It was such once, but these days it has generic communication capabilities as well, so move it todrivers/char/.
Quoted 7 lines
In the future, the hvc part from this file can be split off and moved under
drivers/tty/hvc/.CC Rusty Russell <[email protected]>CC Greg KH <[email protected]>CC Arnd Bergmann <[email protected]>Signed-off-by Amit Shah <[email protected]>
Re: [PATCH] virtio: console: Move file back to drivers/char/
In reply to Amit ShahQuoted 5 lines · Amit Shah
Commit
728674a7e466628df2aeec6d11a2ae1ef968fb67movedvirtio_console.ctodrivers/tty/hvc/under the perception of this being an hvc driver. It was such once, but these days it has generic communication capabilities as well, so move it todrivers/char/.
Quoted 7 lines
In the future, the hvc part from this file can be split off and moved under
drivers/tty/hvc/.CC Rusty Russell <[email protected]>CC Greg KH <[email protected]>CC Arnd Bergmann <[email protected]>Signed-off-by Amit Shah <[email protected]>
PATCH 2/3 tty: move drivers/serial/ to drivers/tty/serial/
In reply to Greg KHThe serial drivers are really just tty drivers, so move them to drivers/tty/ to make things a bit neater overall.
This is part of the tty/serial driver movement proceedure as proposed by Arnd Bergmann and approved by everyone involved a number of months ago.
---
drivers/Makefile | 3 +--
drivers/char/Kconfig | 2 +-
drivers/tty/Makefile | 1 +
drivers/{ => tty}/serial/21285.c | 0
drivers/{ => tty}/serial/68328serial.c | 0
drivers/{ => tty}/serial/68328serial.h | 0
drivers/{ => tty}/serial/68360serial.c | 0
drivers/{ => tty}/serial/8250.c | 0
drivers/{ => tty}/serial/8250.h | 0
drivers/{ => tty}/serial/8250_accent.c | 0
drivers/{ => tty}/serial/8250_acorn.c | 0
drivers/{ => tty}/serial/8250_boca.c | 0
drivers/{ => tty}/serial/8250_early.c | 0
drivers/{ => tty}/serial/8250_exar_st16c554.c | 0
drivers/{ => tty}/serial/8250_fourport.c | 0
drivers/{ => tty}/serial/8250_gsc.c | 0
drivers/{ => tty}/serial/8250_hp300.c | 0
drivers/{ => tty}/serial/8250_hub6.c | 0
drivers/{ => tty}/serial/8250_mca.c | 0
drivers/{ => tty}/serial/8250_pci.c | 0
drivers/{ => tty}/serial/8250_pnp.c | 0
drivers/{ => tty}/serial/Kconfig | 0
drivers/{ => tty}/serial/Makefile | 0
drivers/{ => tty}/serial/altera_jtaguart.c | 0
drivers/{ => tty}/serial/altera_uart.c | 0
drivers/{ => tty}/serial/amba-pl010.c | 0
drivers/{ => tty}/serial/amba-pl011.c | 0
drivers/{ => tty}/serial/apbuart.c | 0
drivers/{ => tty}/serial/apbuart.h | 0
drivers/{ => tty}/serial/atmel_serial.c | 0
drivers/{ => tty}/serial/bcm63xx_uart.c | 0
drivers/{ => tty}/serial/bfin_5xx.c | 0
drivers/{ => tty}/serial/bfin_sport_uart.c | 0
drivers/{ => tty}/serial/bfin_sport_uart.h | 0
drivers/{ => tty}/serial/clps711x.c | 0
drivers/{ => tty}/serial/cpm_uart/Makefile | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart.h | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h | 0
drivers/{ => tty}/serial/crisv10.c | 0
drivers/{ => tty}/serial/crisv10.h | 0
drivers/{ => tty}/serial/dz.c | 0
drivers/{ => tty}/serial/dz.h | 0
drivers/{ => tty}/serial/icom.c | 0
drivers/{ => tty}/serial/icom.h | 0
drivers/{ => tty}/serial/ifx6x60.c | 0
drivers/{ => tty}/serial/ifx6x60.h | 0
drivers/{ => tty}/serial/imx.c | 0
drivers/{ => tty}/serial/ioc3_serial.c | 0
drivers/{ => tty}/serial/ioc4_serial.c | 0
drivers/{ => tty}/serial/ip22zilog.c | 0
drivers/{ => tty}/serial/ip22zilog.h | 0
drivers/{ => tty}/serial/jsm/Makefile | 0
drivers/{ => tty}/serial/jsm/jsm.h | 0
drivers/{ => tty}/serial/jsm/jsm_driver.c | 0
drivers/{ => tty}/serial/jsm/jsm_neo.c | 0
drivers/{ => tty}/serial/jsm/jsm_tty.c | 0
drivers/{ => tty}/serial/kgdboc.c | 0
drivers/{ => tty}/serial/m32r_sio.c | 0
drivers/{ => tty}/serial/m32r_sio.h | 0
drivers/{ => tty}/serial/m32r_sio_reg.h | 0
drivers/{ => tty}/serial/max3100.c | 0
drivers/{ => tty}/serial/max3107-aava.c | 0
drivers/{ => tty}/serial/max3107.c | 0
drivers/{ => tty}/serial/max3107.h | 0
drivers/{ => tty}/serial/mcf.c | 0
drivers/{ => tty}/serial/mfd.c | 0
drivers/{ => tty}/serial/mpc52xx_uart.c | 0
drivers/{ => tty}/serial/mpsc.c | 0
drivers/{ => tty}/serial/mrst_max3110.c | 0
drivers/{ => tty}/serial/mrst_max3110.h | 0
drivers/{ => tty}/serial/msm_serial.c | 0
drivers/{ => tty}/serial/msm_serial.h | 0
drivers/{ => tty}/serial/mux.c | 0
drivers/{ => tty}/serial/netx-serial.c | 0
drivers/{ => tty}/serial/nwpserial.c | 0
drivers/{ => tty}/serial/of_serial.c | 0
drivers/{ => tty}/serial/omap-serial.c | 0
drivers/{ => tty}/serial/pch_uart.c | 0
drivers/{ => tty}/serial/pmac_zilog.c | 0
drivers/{ => tty}/serial/pmac_zilog.h | 0
drivers/{ => tty}/serial/pnx8xxx_uart.c | 0
drivers/{ => tty}/serial/pxa.c | 0
drivers/{ => tty}/serial/s3c2400.c | 0
drivers/{ => tty}/serial/s3c2410.c | 0
drivers/{ => tty}/serial/s3c2412.c | 0
drivers/{ => tty}/serial/s3c2440.c | 0
drivers/{ => tty}/serial/s3c24a0.c | 0
drivers/{ => tty}/serial/s3c6400.c | 0
drivers/{ => tty}/serial/s5pv210.c | 0
drivers/{ => tty}/serial/sa1100.c | 0
drivers/{ => tty}/serial/samsung.c | 0
drivers/{ => tty}/serial/samsung.h | 0
drivers/{ => tty}/serial/sb1250-duart.c | 0
drivers/{ => tty}/serial/sc26xx.c | 0
drivers/{ => tty}/serial/serial_core.c | 0
drivers/{ => tty}/serial/serial_cs.c | 0
drivers/{ => tty}/serial/serial_ks8695.c | 0
drivers/{ => tty}/serial/serial_lh7a40x.c | 0
drivers/{ => tty}/serial/serial_txx9.c | 0
drivers/{ => tty}/serial/sh-sci.c | 0
drivers/{ => tty}/serial/sh-sci.h | 0
drivers/{ => tty}/serial/sn_console.c | 0
drivers/{ => tty}/serial/suncore.c | 0
drivers/{ => tty}/serial/suncore.h | 0
drivers/{ => tty}/serial/sunhv.c | 0
drivers/{ => tty}/serial/sunsab.c | 0
drivers/{ => tty}/serial/sunsab.h | 0
drivers/{ => tty}/serial/sunsu.c | 0
drivers/{ => tty}/serial/sunzilog.c | 0
drivers/{ => tty}/serial/sunzilog.h | 0
drivers/{ => tty}/serial/timbuart.c | 0
drivers/{ => tty}/serial/timbuart.h | 0
drivers/{ => tty}/serial/uartlite.c | 0
drivers/{ => tty}/serial/ucc_uart.c | 0
drivers/{ => tty}/serial/vr41xx_siu.c | 0
drivers/{ => tty}/serial/vt8500_serial.c | 0
drivers/{ => tty}/serial/zs.c | 0
drivers/{ => tty}/serial/zs.h | 0
122 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/{ => tty}/serial/21285.c (100%)
rename drivers/{ => tty}/serial/68328serial.c (100%)
rename drivers/{ => tty}/serial/68328serial.h (100%)
rename drivers/{ => tty}/serial/68360serial.c (100%)
rename drivers/{ => tty}/serial/8250.c (100%)
rename drivers/{ => tty}/serial/8250.h (100%)
rename drivers/{ => tty}/serial/8250_accent.c (100%)
rename drivers/{ => tty}/serial/8250_acorn.c (100%)
rename drivers/{ => tty}/serial/8250_boca.c (100%)
rename drivers/{ => tty}/serial/8250_early.c (100%)
rename drivers/{ => tty}/serial/8250_exar_st16c554.c (100%)
rename drivers/{ => tty}/serial/8250_fourport.c (100%)
rename drivers/{ => tty}/serial/8250_gsc.c (100%)
rename drivers/{ => tty}/serial/8250_hp300.c (100%)
rename drivers/{ => tty}/serial/8250_hub6.c (100%)
rename drivers/{ => tty}/serial/8250_mca.c (100%)
rename drivers/{ => tty}/serial/8250_pci.c (100%)
rename drivers/{ => tty}/serial/8250_pnp.c (100%)
rename drivers/{ => tty}/serial/Kconfig (100%)
rename drivers/{ => tty}/serial/Makefile (100%)
rename drivers/{ => tty}/serial/altera_jtaguart.c (100%)
rename drivers/{ => tty}/serial/altera_uart.c (100%)
rename drivers/{ => tty}/serial/amba-pl010.c (100%)
rename drivers/{ => tty}/serial/amba-pl011.c (100%)
rename drivers/{ => tty}/serial/apbuart.c (100%)
rename drivers/{ => tty}/serial/apbuart.h (100%)
rename drivers/{ => tty}/serial/atmel_serial.c (100%)
rename drivers/{ => tty}/serial/bcm63xx_uart.c (100%)
rename drivers/{ => tty}/serial/bfin_5xx.c (100%)
rename drivers/{ => tty}/serial/bfin_sport_uart.c (100%)
rename drivers/{ => tty}/serial/bfin_sport_uart.h (100%)
rename drivers/{ => tty}/serial/clps711x.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/Makefile (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart.h (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h (100%)
rename drivers/{ => tty}/serial/crisv10.c (100%)
rename drivers/{ => tty}/serial/crisv10.h (100%)
rename drivers/{ => tty}/serial/dz.c (100%)
rename drivers/{ => tty}/serial/dz.h (100%)
rename drivers/{ => tty}/serial/icom.c (100%)
rename drivers/{ => tty}/serial/icom.h (100%)
rename drivers/{ => tty}/serial/ifx6x60.c (100%)
rename drivers/{ => tty}/serial/ifx6x60.h (100%)
rename drivers/{ => tty}/serial/imx.c (100%)
rename drivers/{ => tty}/serial/ioc3_serial.c (100%)
rename drivers/{ => tty}/serial/ioc4_serial.c (100%)
rename drivers/{ => tty}/serial/ip22zilog.c (100%)
rename drivers/{ => tty}/serial/ip22zilog.h (100%)
rename drivers/{ => tty}/serial/jsm/Makefile (100%)
rename drivers/{ => tty}/serial/jsm/jsm.h (100%)
rename drivers/{ => tty}/serial/jsm/jsm_driver.c (100%)
rename drivers/{ => tty}/serial/jsm/jsm_neo.c (100%)
rename drivers/{ => tty}/serial/jsm/jsm_tty.c (100%)
rename drivers/{ => tty}/serial/kgdboc.c (100%)
rename drivers/{ => tty}/serial/m32r_sio.c (100%)
rename drivers/{ => tty}/serial/m32r_sio.h (100%)
rename drivers/{ => tty}/serial/m32r_sio_reg.h (100%)
rename drivers/{ => tty}/serial/max3100.c (100%)
rename drivers/{ => tty}/serial/max3107-aava.c (100%)
rename drivers/{ => tty}/serial/max3107.c (100%)
rename drivers/{ => tty}/serial/max3107.h (100%)
rename drivers/{ => tty}/serial/mcf.c (100%)
rename drivers/{ => tty}/serial/mfd.c (100%)
rename drivers/{ => tty}/serial/mpc52xx_uart.c (100%)
rename drivers/{ => tty}/serial/mpsc.c (100%)
rename drivers/{ => tty}/serial/mrst_max3110.c (100%)
rename drivers/{ => tty}/serial/mrst_max3110.h (100%)
rename drivers/{ => tty}/serial/msm_serial.c (100%)
rename drivers/{ => tty}/serial/msm_serial.h (100%)
rename drivers/{ => tty}/serial/mux.c (100%)
rename drivers/{ => tty}/serial/netx-serial.c (100%)
rename drivers/{ => tty}/serial/nwpserial.c (100%)
rename drivers/{ => tty}/serial/of_serial.c (100%)
rename drivers/{ => tty}/serial/omap-serial.c (100%)
rename drivers/{ => tty}/serial/pch_uart.c (100%)
rename drivers/{ => tty}/serial/pmac_zilog.c (100%)
rename drivers/{ => tty}/serial/pmac_zilog.h (100%)
rename drivers/{ => tty}/serial/pnx8xxx_uart.c (100%)
rename drivers/{ => tty}/serial/pxa.c (100%)
rename drivers/{ => tty}/serial/s3c2400.c (100%)
rename drivers/{ => tty}/serial/s3c2410.c (100%)
rename drivers/{ => tty}/serial/s3c2412.c (100%)
rename drivers/{ => tty}/serial/s3c2440.c (100%)
rename drivers/{ => tty}/serial/s3c24a0.c (100%)
rename drivers/{ => tty}/serial/s3c6400.c (100%)
rename drivers/{ => tty}/serial/s5pv210.c (100%)
rename drivers/{ => tty}/serial/sa1100.c (100%)
rename drivers/{ => tty}/serial/samsung.c (100%)
rename drivers/{ => tty}/serial/samsung.h (100%)
rename drivers/{ => tty}/serial/sb1250-duart.c (100%)
rename drivers/{ => tty}/serial/sc26xx.c (100%)
rename drivers/{ => tty}/serial/serial_core.c (100%)
rename drivers/{ => tty}/serial/serial_cs.c (100%)
rename drivers/{ => tty}/serial/serial_ks8695.c (100%)
rename drivers/{ => tty}/serial/serial_lh7a40x.c (100%)
rename drivers/{ => tty}/serial/serial_txx9.c (100%)
rename drivers/{ => tty}/serial/sh-sci.c (100%)
rename drivers/{ => tty}/serial/sh-sci.h (100%)
rename drivers/{ => tty}/serial/sn_console.c (100%)
rename drivers/{ => tty}/serial/suncore.c (100%)
rename drivers/{ => tty}/serial/suncore.h (100%)
rename drivers/{ => tty}/serial/sunhv.c (100%)
rename drivers/{ => tty}/serial/sunsab.c (100%)
rename drivers/{ => tty}/serial/sunsab.h (100%)
rename drivers/{ => tty}/serial/sunsu.c (100%)
rename drivers/{ => tty}/serial/sunzilog.c (100%)
rename drivers/{ => tty}/serial/sunzilog.h (100%)
rename drivers/{ => tty}/serial/timbuart.c (100%)
rename drivers/{ => tty}/serial/timbuart.h (100%)
rename drivers/{ => tty}/serial/uartlite.c (100%)
rename drivers/{ => tty}/serial/ucc_uart.c (100%)
rename drivers/{ => tty}/serial/vr41xx_siu.c (100%)
rename drivers/{ => tty}/serial/vt8500_serial.c (100%)
rename drivers/{ => tty}/serial/zs.c (100%)
rename drivers/{ => tty}/serial/zs.h (100%)drivers/Makefile +1 -2
@@ -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 +1 -1
@@ -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/tty/Makefile +1 -0
@@ -10,3 +10,4 @@ obj-$(CONFIG_R3964) += n_r3964.o obj-y += vt/ obj-$(CONFIG_HVC_DRIVER) += hvc/ +obj-y += serial/
drivers/tty/serial/21285.c renamed from drivers/serial/21285.c +0 -0
drivers/tty/serial/68328serial.c renamed from drivers/serial/68328serial.c +0 -0
drivers/tty/serial/68328serial.h renamed from drivers/serial/68328serial.h +0 -0
drivers/tty/serial/68360serial.c renamed from drivers/serial/68360serial.c +0 -0
drivers/tty/serial/8250.c renamed from drivers/serial/8250.c +0 -0
drivers/tty/serial/8250.h renamed from drivers/serial/8250.h +0 -0
drivers/tty/serial/8250_accent.c renamed from drivers/serial/8250_accent.c +0 -0
drivers/tty/serial/8250_acorn.c renamed from drivers/serial/8250_acorn.c +0 -0
drivers/tty/serial/8250_boca.c renamed from drivers/serial/8250_boca.c +0 -0
drivers/tty/serial/8250_early.c renamed from drivers/serial/8250_early.c +0 -0
drivers/tty/serial/8250_exar_st16c554.c renamed from drivers/serial/8250_exar_st16c554.c +0 -0
drivers/tty/serial/8250_fourport.c renamed from drivers/serial/8250_fourport.c +0 -0
drivers/tty/serial/8250_gsc.c renamed from drivers/serial/8250_gsc.c +0 -0
drivers/tty/serial/8250_hp300.c renamed from drivers/serial/8250_hp300.c +0 -0
drivers/tty/serial/8250_hub6.c renamed from drivers/serial/8250_hub6.c +0 -0
drivers/tty/serial/8250_mca.c renamed from drivers/serial/8250_mca.c +0 -0
drivers/tty/serial/8250_pci.c renamed from drivers/serial/8250_pci.c +0 -0
drivers/tty/serial/8250_pnp.c renamed from drivers/serial/8250_pnp.c +0 -0
drivers/tty/serial/Kconfig renamed from drivers/serial/Kconfig +0 -0
drivers/tty/serial/Makefile renamed from drivers/serial/Makefile +0 -0
drivers/tty/serial/altera_jtaguart.c renamed from drivers/serial/altera_jtaguart.c +0 -0
drivers/tty/serial/altera_uart.c renamed from drivers/serial/altera_uart.c +0 -0
drivers/tty/serial/amba-pl010.c renamed from drivers/serial/amba-pl010.c +0 -0
drivers/tty/serial/amba-pl011.c renamed from drivers/serial/amba-pl011.c +0 -0
drivers/tty/serial/apbuart.c renamed from drivers/serial/apbuart.c +0 -0
drivers/tty/serial/apbuart.h renamed from drivers/serial/apbuart.h +0 -0
drivers/tty/serial/atmel_serial.c renamed from drivers/serial/atmel_serial.c +0 -0
drivers/tty/serial/bcm63xx_uart.c renamed from drivers/serial/bcm63xx_uart.c +0 -0
drivers/tty/serial/bfin_5xx.c renamed from drivers/serial/bfin_5xx.c +0 -0
drivers/tty/serial/bfin_sport_uart.c renamed from drivers/serial/bfin_sport_uart.c +0 -0
drivers/tty/serial/bfin_sport_uart.h renamed from drivers/serial/bfin_sport_uart.h +0 -0
drivers/tty/serial/clps711x.c renamed from drivers/serial/clps711x.c +0 -0
drivers/tty/serial/cpm_uart/Makefile renamed from drivers/serial/cpm_uart/Makefile +0 -0
drivers/tty/serial/cpm_uart/cpm_uart.h renamed from drivers/serial/cpm_uart/cpm_uart.h +0 -0
drivers/tty/serial/cpm_uart/cpm_uart_core.c renamed from drivers/serial/cpm_uart/cpm_uart_core.c +0 -0
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c renamed from drivers/serial/cpm_uart/cpm_uart_cpm1.c +0 -0
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h renamed from drivers/serial/cpm_uart/cpm_uart_cpm1.h +0 -0
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.c +0 -0
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.h +0 -0
drivers/tty/serial/crisv10.c renamed from drivers/serial/crisv10.c +0 -0
drivers/tty/serial/crisv10.h renamed from drivers/serial/crisv10.h +0 -0
drivers/tty/serial/dz.c renamed from drivers/serial/dz.c +0 -0
drivers/tty/serial/dz.h renamed from drivers/serial/dz.h +0 -0
drivers/tty/serial/icom.c renamed from drivers/serial/icom.c +0 -0
drivers/tty/serial/icom.h renamed from drivers/serial/icom.h +0 -0
drivers/tty/serial/ifx6x60.c renamed from drivers/serial/ifx6x60.c +0 -0
drivers/tty/serial/ifx6x60.h renamed from drivers/serial/ifx6x60.h +0 -0
drivers/tty/serial/imx.c renamed from drivers/serial/imx.c +0 -0
drivers/tty/serial/ioc3_serial.c renamed from drivers/serial/ioc3_serial.c +0 -0
drivers/tty/serial/ioc4_serial.c renamed from drivers/serial/ioc4_serial.c +0 -0
drivers/tty/serial/ip22zilog.c renamed from drivers/serial/ip22zilog.c +0 -0
drivers/tty/serial/ip22zilog.h renamed from drivers/serial/ip22zilog.h +0 -0
drivers/tty/serial/jsm/Makefile renamed from drivers/serial/jsm/Makefile +0 -0
drivers/tty/serial/jsm/jsm.h renamed from drivers/serial/jsm/jsm.h +0 -0
drivers/tty/serial/jsm/jsm_driver.c renamed from drivers/serial/jsm/jsm_driver.c +0 -0
drivers/tty/serial/jsm/jsm_neo.c renamed from drivers/serial/jsm/jsm_neo.c +0 -0
drivers/tty/serial/jsm/jsm_tty.c renamed from drivers/serial/jsm/jsm_tty.c +0 -0
drivers/tty/serial/kgdboc.c renamed from drivers/serial/kgdboc.c +0 -0
drivers/tty/serial/m32r_sio.c renamed from drivers/serial/m32r_sio.c +0 -0
drivers/tty/serial/m32r_sio.h renamed from drivers/serial/m32r_sio.h +0 -0
drivers/tty/serial/m32r_sio_reg.h renamed from drivers/serial/m32r_sio_reg.h +0 -0
drivers/tty/serial/max3100.c renamed from drivers/serial/max3100.c +0 -0
drivers/tty/serial/max3107-aava.c renamed from drivers/serial/max3107-aava.c +0 -0
drivers/tty/serial/max3107.c renamed from drivers/serial/max3107.c +0 -0
drivers/tty/serial/max3107.h renamed from drivers/serial/max3107.h +0 -0
drivers/tty/serial/mcf.c renamed from drivers/serial/mcf.c +0 -0
drivers/tty/serial/mfd.c renamed from drivers/serial/mfd.c +0 -0
drivers/tty/serial/mpc52xx_uart.c renamed from drivers/serial/mpc52xx_uart.c +0 -0
drivers/tty/serial/mpsc.c renamed from drivers/serial/mpsc.c +0 -0
drivers/tty/serial/mrst_max3110.c renamed from drivers/serial/mrst_max3110.c +0 -0
drivers/tty/serial/mrst_max3110.h renamed from drivers/serial/mrst_max3110.h +0 -0
drivers/tty/serial/msm_serial.c renamed from drivers/serial/msm_serial.c +0 -0
drivers/tty/serial/msm_serial.h renamed from drivers/serial/msm_serial.h +0 -0
drivers/tty/serial/mux.c renamed from drivers/serial/mux.c +0 -0
drivers/tty/serial/netx-serial.c renamed from drivers/serial/netx-serial.c +0 -0
drivers/tty/serial/nwpserial.c renamed from drivers/serial/nwpserial.c +0 -0
drivers/tty/serial/of_serial.c renamed from drivers/serial/of_serial.c +0 -0
drivers/tty/serial/omap-serial.c renamed from drivers/serial/omap-serial.c +0 -0
drivers/tty/serial/pch_uart.c renamed from drivers/serial/pch_uart.c +0 -0
drivers/tty/serial/pmac_zilog.c renamed from drivers/serial/pmac_zilog.c +0 -0
drivers/tty/serial/pmac_zilog.h renamed from drivers/serial/pmac_zilog.h +0 -0
drivers/tty/serial/pnx8xxx_uart.c renamed from drivers/serial/pnx8xxx_uart.c +0 -0
drivers/tty/serial/pxa.c renamed from drivers/serial/pxa.c +0 -0
drivers/tty/serial/s3c2400.c renamed from drivers/serial/s3c2400.c +0 -0
drivers/tty/serial/s3c2410.c renamed from drivers/serial/s3c2410.c +0 -0
drivers/tty/serial/s3c2412.c renamed from drivers/serial/s3c2412.c +0 -0
drivers/tty/serial/s3c2440.c renamed from drivers/serial/s3c2440.c +0 -0
drivers/tty/serial/s3c24a0.c renamed from drivers/serial/s3c24a0.c +0 -0
drivers/tty/serial/s3c6400.c renamed from drivers/serial/s3c6400.c +0 -0
drivers/tty/serial/s5pv210.c renamed from drivers/serial/s5pv210.c +0 -0
drivers/tty/serial/sa1100.c renamed from drivers/serial/sa1100.c +0 -0
drivers/tty/serial/samsung.c renamed from drivers/serial/samsung.c +0 -0
drivers/tty/serial/samsung.h renamed from drivers/serial/samsung.h +0 -0
drivers/tty/serial/sb1250-duart.c renamed from drivers/serial/sb1250-duart.c +0 -0
drivers/tty/serial/sc26xx.c renamed from drivers/serial/sc26xx.c +0 -0
drivers/tty/serial/serial_core.c renamed from drivers/serial/serial_core.c +0 -0
drivers/tty/serial/serial_cs.c renamed from drivers/serial/serial_cs.c +0 -0
drivers/tty/serial/serial_ks8695.c renamed from drivers/serial/serial_ks8695.c +0 -0
drivers/tty/serial/serial_lh7a40x.c renamed from drivers/serial/serial_lh7a40x.c +0 -0
drivers/tty/serial/serial_txx9.c renamed from drivers/serial/serial_txx9.c +0 -0
drivers/tty/serial/sh-sci.c renamed from drivers/serial/sh-sci.c +0 -0
drivers/tty/serial/sh-sci.h renamed from drivers/serial/sh-sci.h +0 -0
drivers/tty/serial/sn_console.c renamed from drivers/serial/sn_console.c +0 -0
drivers/tty/serial/suncore.c renamed from drivers/serial/suncore.c +0 -0
drivers/tty/serial/suncore.h renamed from drivers/serial/suncore.h +0 -0
drivers/tty/serial/sunhv.c renamed from drivers/serial/sunhv.c +0 -0
drivers/tty/serial/sunsab.c renamed from drivers/serial/sunsab.c +0 -0
drivers/tty/serial/sunsab.h renamed from drivers/serial/sunsab.h +0 -0
drivers/tty/serial/sunsu.c renamed from drivers/serial/sunsu.c +0 -0
drivers/tty/serial/sunzilog.c renamed from drivers/serial/sunzilog.c +0 -0
drivers/tty/serial/sunzilog.h renamed from drivers/serial/sunzilog.h +0 -0
drivers/tty/serial/timbuart.c renamed from drivers/serial/timbuart.c +0 -0
drivers/tty/serial/timbuart.h renamed from drivers/serial/timbuart.h +0 -0
drivers/tty/serial/uartlite.c renamed from drivers/serial/uartlite.c +0 -0
drivers/tty/serial/ucc_uart.c renamed from drivers/serial/ucc_uart.c +0 -0
drivers/tty/serial/vr41xx_siu.c renamed from drivers/serial/vr41xx_siu.c +0 -0
drivers/tty/serial/vt8500_serial.c renamed from drivers/serial/vt8500_serial.c +0 -0
drivers/tty/serial/zs.c renamed from drivers/serial/zs.c +0 -0
drivers/tty/serial/zs.h renamed from drivers/serial/zs.h +0 -0
Signature · 1 line
1.7.1
Re: [PATCH 2/3] tty: move drivers/serial/ to drivers/tty/serial/
Quoted 6 lines · On Thursday 20 January 2011 19:03:44 Greg Kroah-Hartman wrote:
The serial drivers are really just tty drivers, so move them to
drivers/tty/to make things a bit neater overall.This is part of the tty/serial driver movement proceedure as proposed by Arnd Bergmann and approved by everyone involved a number of months ago.
Quoted 6 lines
Cc Arnd Bergmann <[email protected]>Cc Alan Cox <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Rogier Wolff <[email protected]>Cc Michael H. Warfield <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
PATCH 3/3 tty: update MAINTAINERS file due to driver movement
In reply to Greg KHThis fixes up the MAINTAINERS file due to moving the serial drivers to the drivers/tty/ directory.
--- MAINTAINERS | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-)
MAINTAINERS +25 -25
@@ -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]>
@@ -1862,7 +1862,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]>
@@ -2201,7 +2201,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]>
@@ -2621,7 +2621,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]>
@@ -3328,7 +3328,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]>
@@ -3505,7 +3505,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/ K8TEMP HARDWARE MONITORING DRIVER M: Rudolf Marek <[email protected]>
@@ -3648,7 +3648,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/
@@ -5510,7 +5510,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
@@ -5532,7 +5532,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*
@@ -5752,14 +5752,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]>
@@ -6089,8 +6089,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
@@ -6829,7 +6829,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]>
@@ -6875,7 +6875,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]>
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerQuoted 8 lines · On Thursday 20 January 2011 18:49:10 Greg KH wrote:
As mentioned before in previous TTY git pull for .38, here's the big movement of the serial drivers into the
drivers/tty/subdirectory that needed to wait until after .38-rc1 was out.It merely moves the hvc drivers to
drivers/tty/hvc/and thedrivers/serial/directory todrivers/tty/serial/and fixes up theMAINTAINERSfile to point to the proper locations of the files now that they have been moved.
Hi Greg,
Thanks for following up on this!
I noticed that this moves the majority of all the tty drivers, but not the serial drivers from the drivers/char directory as my original patch series did. Is that something you still plan to do, or would you like me to respin that part of my patches for the next merge window?
Arnd
Quoted 10 lines · Arnd Bergmann
Quoted 8 lines · On Thursday 20 January 2011 18:49:10 Greg KH wrote:
As mentioned before in previous TTY git pull for .38, here's the big movement of the serial drivers into the
drivers/tty/subdirectory that needed to wait until after .38-rc1 was out.It merely moves the hvc drivers to
drivers/tty/hvc/and thedrivers/serial/directory todrivers/tty/serial/and fixes up theMAINTAINERSfile to point to the proper locations of the files now that they have been moved.
Quoted 8 lines
Hi Greg,
Thanks for following up on this!
I noticed that this moves the majority of all the tty drivers, but not the serial drivers from the
drivers/chardirectory as my original patch series did. Is that something you still plan to do, or would you like me to respin that part of my patches for the next merge window?
I was going to do that for the next set of patches, for .39. I will be moving some of the drivers into the staging tree as well, as was discussed. I figured it was better to move things slower, making merges from other trees easier, than to do it in all one big jump.
I still have your original patch series here which is what I am working off of, so don't worry, it's not forgotten :)
thanks,
greg k-h
Quoted 4 lines
I noticed that this moves the majority of all the tty drivers, but not the serial drivers from the
drivers/chardirectory as my original patch series did. Is that something you still plan to do, or would you like me to respin that part of my patches for the next merge window?
Please keep the drivers/char ones in another directory. The "serial" directory is those using the serial_core, plus a pair of old m68k things that want deleting anyway.
How about drivers/tty/misc for the char ones ?
Quoted 10 lines · Alan Cox
Quoted 4 lines
I noticed that this moves the majority of all the tty drivers, but not the serial drivers from the
drivers/chardirectory as my original patch series did. Is that something you still plan to do, or would you like me to respin that part of my patches for the next merge window?Please keep the
drivers/charones in another directory. The "serial" directory is those using theserial_core, plus a pair of old m68k things that want deleting anyway.How about
drivers/tty/miscfor the char ones ?
That's fine with me. I'll do the movement in a few weeks.
thanks,
greg k-h