tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty: update MAINTAINERS file due to driver movement
tty: move drivers/serial/ to drivers/tty/serial/
tty: move hvc drivers to drivers/tty/hvc/

Linus Torvalds fc887b15 466c1906

+42 -41
unified split
+25 -25
MAINTAINERS
··· 162 162 W: http://serial.sourceforge.net 163 163 S: Maintained 164 164 T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git 165 - F: drivers/serial/8250* 165 + F: drivers/tty/serial/8250* 166 166 F: include/linux/serial_8250.h 167 167 168 168 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.] ··· 888 888 F: drivers/video/msm/ 889 889 F: drivers/mmc/host/msm_sdcc.c 890 890 F: drivers/mmc/host/msm_sdcc.h 891 - F: drivers/serial/msm_serial.h 892 - F: drivers/serial/msm_serial.c 891 + F: drivers/tty/serial/msm_serial.h 892 + F: drivers/tty/serial/msm_serial.c 893 893 T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git 894 894 S: Maintained 895 895 ··· 1256 1256 ATMEL AT91 / AT32 SERIAL DRIVER 1257 1257 M: Nicolas Ferre <nicolas.ferre@atmel.com> 1258 1258 S: Supported 1259 - F: drivers/serial/atmel_serial.c 1259 + F: drivers/tty/serial/atmel_serial.c 1260 1260 1261 1261 ATMEL LCDFB DRIVER 1262 1262 M: Nicolas Ferre <nicolas.ferre@atmel.com> ··· 1412 1412 L: uclinux-dist-devel@blackfin.uclinux.org 1413 1413 W: http://blackfin.uclinux.org 1414 1414 S: Supported 1415 - F: drivers/serial/bfin_5xx.c 1415 + F: drivers/tty/serial/bfin_5xx.c 1416 1416 1417 1417 BLACKFIN WATCHDOG DRIVER 1418 1418 M: Mike Frysinger <vapier.adi@gmail.com> ··· 1877 1877 W: http://developer.axis.com 1878 1878 S: Maintained 1879 1879 F: arch/cris/ 1880 - F: drivers/serial/crisv10.* 1880 + F: drivers/tty/serial/crisv10.* 1881 1881 1882 1882 CRYPTO API 1883 1883 M: Herbert Xu <herbert@gondor.apana.org.au> ··· 2216 2216 DZ DECSTATION DZ11 SERIAL DRIVER 2217 2217 M: "Maciej W. Rozycki" <macro@linux-mips.org> 2218 2218 S: Maintained 2219 - F: drivers/serial/dz.* 2219 + F: drivers/tty/serial/dz.* 2220 2220 2221 2221 EATA-DMA SCSI DRIVER 2222 2222 M: Michael Neuffer <mike@i-Connect.Net> ··· 2643 2643 M: Timur Tabi <timur@freescale.com> 2644 2644 L: linuxppc-dev@lists.ozlabs.org 2645 2645 S: Supported 2646 - F: drivers/serial/ucc_uart.c 2646 + F: drivers/tty/serial/ucc_uart.c 2647 2647 2648 2648 FREESCALE SOC SOUND DRIVERS 2649 2649 M: Timur Tabi <timur@freescale.com> ··· 3350 3350 M: Pat Gefre <pfg@sgi.com> 3351 3351 L: linux-serial@vger.kernel.org 3352 3352 S: Maintained 3353 - F: drivers/serial/ioc3_serial.c 3353 + F: drivers/tty/serial/ioc3_serial.c 3354 3354 3355 3355 IP MASQUERADING 3356 3356 M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> ··· 3527 3527 M: Breno Leitao <leitao@linux.vnet.ibm.com> 3528 3528 L: linux-serial@vger.kernel.org 3529 3529 S: Maintained 3530 - F: drivers/serial/jsm/ 3530 + F: drivers/tty/serial/jsm/ 3531 3531 3532 3532 K10TEMP HARDWARE MONITORING DRIVER 3533 3533 M: Clemens Ladisch <clemens@ladisch.de> ··· 3677 3677 S: Maintained 3678 3678 F: Documentation/DocBook/kgdb.tmpl 3679 3679 F: drivers/misc/kgdbts.c 3680 - F: drivers/serial/kgdboc.c 3680 + F: drivers/tty/serial/kgdboc.c 3681 3681 F: include/linux/kdb.h 3682 3682 F: include/linux/kgdb.h 3683 3683 F: kernel/debug/ ··· 5545 5545 L: linux-ia64@vger.kernel.org 5546 5546 S: Supported 5547 5547 F: Documentation/ia64/serial.txt 5548 - F: drivers/serial/ioc?_serial.c 5548 + F: drivers/tty/serial/ioc?_serial.c 5549 5549 F: include/linux/ioc?.h 5550 5550 5551 5551 SGI VISUAL WORKSTATION 320 AND 540 ··· 5567 5567 S: Maintained 5568 5568 F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen 5569 5569 F: arch/arm/mach-lh7a40x/ 5570 - F: drivers/serial/serial_lh7a40x.c 5570 + F: drivers/tty/serial/serial_lh7a40x.c 5571 5571 F: drivers/usb/gadget/lh7a40* 5572 5572 F: drivers/usb/host/ohci-lh7a40* 5573 5573 ··· 5787 5787 T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git 5788 5788 T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git 5789 5789 S: Maintained 5790 - F: drivers/serial/suncore.c 5791 - F: drivers/serial/suncore.h 5792 - F: drivers/serial/sunhv.c 5793 - F: drivers/serial/sunsab.c 5794 - F: drivers/serial/sunsab.h 5795 - F: drivers/serial/sunsu.c 5796 - F: drivers/serial/sunzilog.c 5797 - F: drivers/serial/sunzilog.h 5790 + F: drivers/tty/serial/suncore.c 5791 + F: drivers/tty/serial/suncore.h 5792 + F: drivers/tty/serial/sunhv.c 5793 + F: drivers/tty/serial/sunsab.c 5794 + F: drivers/tty/serial/sunsab.h 5795 + F: drivers/tty/serial/sunsu.c 5796 + F: drivers/tty/serial/sunzilog.c 5797 + F: drivers/tty/serial/sunzilog.h 5798 5798 5799 5799 SPEAR PLATFORM SUPPORT 5800 5800 M: Viresh Kumar <viresh.kumar@st.com> ··· 6124 6124 M: Greg Kroah-Hartman <gregkh@suse.de> 6125 6125 S: Maintained 6126 6126 T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git 6127 - F: drivers/char/tty_* 6128 - F: drivers/serial/serial_core.c 6127 + F: drivers/tty/* 6128 + F: drivers/tty/serial/serial_core.c 6129 6129 F: include/linux/serial_core.h 6130 6130 F: include/linux/serial.h 6131 6131 F: include/linux/tty.h ··· 6870 6870 M: Peter Korsgaard <jacmet@sunsite.dk> 6871 6871 L: linux-serial@vger.kernel.org 6872 6872 S: Maintained 6873 - F: drivers/serial/uartlite.c 6873 + F: drivers/tty/serial/uartlite.c 6874 6874 6875 6875 YAM DRIVER FOR AX.25 6876 6876 M: Jean-Paul Roubelat <jpr@f6fbb.org> ··· 6916 6916 ZS DECSTATION Z85C30 SERIAL DRIVER 6917 6917 M: "Maciej W. Rozycki" <macro@linux-mips.org> 6918 6918 S: Maintained 6919 - F: drivers/serial/zs.* 6919 + F: drivers/tty/serial/zs.* 6920 6920 6921 6921 GRE DEMULTIPLEXER DRIVER 6922 6922 M: Dmitry Kozlov <xeb@mail.ru>
+1 -2
drivers/Makefile
··· 24 24 # regulators early, since some subsystems rely on them to initialize 25 25 obj-$(CONFIG_REGULATOR) += regulator/ 26 26 27 - # char/ comes before serial/ etc so that the VT console is the boot-time 27 + # tty/ comes before char/ so that the VT console is the boot-time 28 28 # default. 29 29 obj-y += tty/ 30 30 obj-y += char/ ··· 38 38 obj-$(CONFIG_FB_I810) += video/i810/ 39 39 obj-$(CONFIG_FB_INTEL) += video/intelfb/ 40 40 41 - obj-y += serial/ 42 41 obj-$(CONFIG_PARPORT) += parport/ 43 42 obj-y += base/ block/ misc/ mfd/ nfc/ 44 43 obj-$(CONFIG_NUBUS) += nubus/
+1 -1
drivers/char/Kconfig
··· 426 426 If you have an SGI Altix with an attached SABrick 427 427 say Y or M here, otherwise say N. 428 428 429 - source "drivers/serial/Kconfig" 429 + source "drivers/tty/serial/Kconfig" 430 430 431 431 config UNIX98_PTYS 432 432 bool "Unix98 PTY support" if EMBEDDED
-13
drivers/char/Makefile
··· 30 30 obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o 31 31 obj-$(CONFIG_SX) += sx.o generic_serial.o 32 32 obj-$(CONFIG_RIO) += rio/ generic_serial.o 33 - obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o 34 - obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o 35 - obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o 36 - obj-$(CONFIG_HVC_TILE) += hvc_tile.o 37 - obj-$(CONFIG_HVC_DCC) += hvc_dcc.o 38 - obj-$(CONFIG_HVC_BEAT) += hvc_beat.o 39 - obj-$(CONFIG_HVC_DRIVER) += hvc_console.o 40 - obj-$(CONFIG_HVC_IRQ) += hvc_irq.o 41 - obj-$(CONFIG_HVC_XEN) += hvc_xen.o 42 - obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o 43 - obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o 44 - obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o 45 33 obj-$(CONFIG_RAW_DRIVER) += raw.o 46 34 obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o 47 35 obj-$(CONFIG_MSPEC) += mspec.o 48 36 obj-$(CONFIG_MMTIMER) += mmtimer.o 49 37 obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o 50 38 obj-$(CONFIG_VIOTAPE) += viotape.o 51 - obj-$(CONFIG_HVCS) += hvcs.o 52 39 obj-$(CONFIG_IBM_BSR) += bsr.o 53 40 obj-$(CONFIG_SGI_MBCS) += mbcs.o 54 41 obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
drivers/char/hvc_beat.c drivers/tty/hvc/hvc_beat.c
drivers/char/hvc_console.c drivers/tty/hvc/hvc_console.c
drivers/char/hvc_console.h drivers/tty/hvc/hvc_console.h
drivers/char/hvc_dcc.c drivers/tty/hvc/hvc_dcc.c
drivers/char/hvc_irq.c drivers/tty/hvc/hvc_irq.c
drivers/char/hvc_iseries.c drivers/tty/hvc/hvc_iseries.c
drivers/char/hvc_iucv.c drivers/tty/hvc/hvc_iucv.c
drivers/char/hvc_rtas.c drivers/tty/hvc/hvc_rtas.c
drivers/char/hvc_tile.c drivers/tty/hvc/hvc_tile.c
drivers/char/hvc_udbg.c drivers/tty/hvc/hvc_udbg.c
drivers/char/hvc_vio.c drivers/tty/hvc/hvc_vio.c
drivers/char/hvc_xen.c drivers/tty/hvc/hvc_xen.c
drivers/char/hvcs.c drivers/tty/hvc/hvcs.c
drivers/char/hvsi.c drivers/tty/hvc/hvsi.c
drivers/char/virtio_console.c drivers/tty/hvc/virtio_console.c
drivers/serial/21285.c drivers/tty/serial/21285.c
drivers/serial/68328serial.c drivers/tty/serial/68328serial.c
drivers/serial/68328serial.h drivers/tty/serial/68328serial.h
drivers/serial/68360serial.c drivers/tty/serial/68360serial.c
drivers/serial/8250.c drivers/tty/serial/8250.c
drivers/serial/8250.h drivers/tty/serial/8250.h
drivers/serial/8250_accent.c drivers/tty/serial/8250_accent.c
drivers/serial/8250_acorn.c drivers/tty/serial/8250_acorn.c
drivers/serial/8250_boca.c drivers/tty/serial/8250_boca.c
drivers/serial/8250_early.c drivers/tty/serial/8250_early.c
drivers/serial/8250_exar_st16c554.c drivers/tty/serial/8250_exar_st16c554.c
drivers/serial/8250_fourport.c drivers/tty/serial/8250_fourport.c
drivers/serial/8250_gsc.c drivers/tty/serial/8250_gsc.c
drivers/serial/8250_hp300.c drivers/tty/serial/8250_hp300.c
drivers/serial/8250_hub6.c drivers/tty/serial/8250_hub6.c
drivers/serial/8250_mca.c drivers/tty/serial/8250_mca.c
drivers/serial/8250_pci.c drivers/tty/serial/8250_pci.c
drivers/serial/8250_pnp.c drivers/tty/serial/8250_pnp.c
drivers/serial/Kconfig drivers/tty/serial/Kconfig
drivers/serial/Makefile drivers/tty/serial/Makefile
drivers/serial/altera_jtaguart.c drivers/tty/serial/altera_jtaguart.c
drivers/serial/altera_uart.c drivers/tty/serial/altera_uart.c
drivers/serial/amba-pl010.c drivers/tty/serial/amba-pl010.c
drivers/serial/amba-pl011.c drivers/tty/serial/amba-pl011.c
drivers/serial/apbuart.c drivers/tty/serial/apbuart.c
drivers/serial/apbuart.h drivers/tty/serial/apbuart.h
drivers/serial/atmel_serial.c drivers/tty/serial/atmel_serial.c
drivers/serial/bcm63xx_uart.c drivers/tty/serial/bcm63xx_uart.c
drivers/serial/bfin_5xx.c drivers/tty/serial/bfin_5xx.c
drivers/serial/bfin_sport_uart.c drivers/tty/serial/bfin_sport_uart.c
drivers/serial/bfin_sport_uart.h drivers/tty/serial/bfin_sport_uart.h
drivers/serial/clps711x.c drivers/tty/serial/clps711x.c
drivers/serial/cpm_uart/Makefile drivers/tty/serial/cpm_uart/Makefile
drivers/serial/cpm_uart/cpm_uart.h drivers/tty/serial/cpm_uart/cpm_uart.h
drivers/serial/cpm_uart/cpm_uart_core.c drivers/tty/serial/cpm_uart/cpm_uart_core.c
drivers/serial/cpm_uart/cpm_uart_cpm1.c drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
drivers/serial/cpm_uart/cpm_uart_cpm1.h drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
drivers/serial/cpm_uart/cpm_uart_cpm2.c drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
drivers/serial/cpm_uart/cpm_uart_cpm2.h drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
drivers/serial/crisv10.c drivers/tty/serial/crisv10.c
drivers/serial/crisv10.h drivers/tty/serial/crisv10.h
drivers/serial/dz.c drivers/tty/serial/dz.c
drivers/serial/dz.h drivers/tty/serial/dz.h
drivers/serial/icom.c drivers/tty/serial/icom.c
drivers/serial/icom.h drivers/tty/serial/icom.h
drivers/serial/ifx6x60.c drivers/tty/serial/ifx6x60.c
drivers/serial/ifx6x60.h drivers/tty/serial/ifx6x60.h
drivers/serial/imx.c drivers/tty/serial/imx.c
drivers/serial/ioc3_serial.c drivers/tty/serial/ioc3_serial.c
drivers/serial/ioc4_serial.c drivers/tty/serial/ioc4_serial.c
drivers/serial/ip22zilog.c drivers/tty/serial/ip22zilog.c
drivers/serial/ip22zilog.h drivers/tty/serial/ip22zilog.h
drivers/serial/jsm/Makefile drivers/tty/serial/jsm/Makefile
drivers/serial/jsm/jsm.h drivers/tty/serial/jsm/jsm.h
drivers/serial/jsm/jsm_driver.c drivers/tty/serial/jsm/jsm_driver.c
drivers/serial/jsm/jsm_neo.c drivers/tty/serial/jsm/jsm_neo.c
drivers/serial/jsm/jsm_tty.c drivers/tty/serial/jsm/jsm_tty.c
drivers/serial/kgdboc.c drivers/tty/serial/kgdboc.c
drivers/serial/m32r_sio.c drivers/tty/serial/m32r_sio.c
drivers/serial/m32r_sio.h drivers/tty/serial/m32r_sio.h
drivers/serial/m32r_sio_reg.h drivers/tty/serial/m32r_sio_reg.h
drivers/serial/max3100.c drivers/tty/serial/max3100.c
drivers/serial/max3107-aava.c drivers/tty/serial/max3107-aava.c
drivers/serial/max3107.c drivers/tty/serial/max3107.c
drivers/serial/max3107.h drivers/tty/serial/max3107.h
drivers/serial/mcf.c drivers/tty/serial/mcf.c
drivers/serial/mfd.c drivers/tty/serial/mfd.c
drivers/serial/mpc52xx_uart.c drivers/tty/serial/mpc52xx_uart.c
drivers/serial/mpsc.c drivers/tty/serial/mpsc.c
drivers/serial/mrst_max3110.c drivers/tty/serial/mrst_max3110.c
drivers/serial/mrst_max3110.h drivers/tty/serial/mrst_max3110.h
drivers/serial/msm_serial.c drivers/tty/serial/msm_serial.c
drivers/serial/msm_serial.h drivers/tty/serial/msm_serial.h
drivers/serial/mux.c drivers/tty/serial/mux.c
drivers/serial/netx-serial.c drivers/tty/serial/netx-serial.c
drivers/serial/nwpserial.c drivers/tty/serial/nwpserial.c
drivers/serial/of_serial.c drivers/tty/serial/of_serial.c
drivers/serial/omap-serial.c drivers/tty/serial/omap-serial.c
drivers/serial/pch_uart.c drivers/tty/serial/pch_uart.c
drivers/serial/pmac_zilog.c drivers/tty/serial/pmac_zilog.c
drivers/serial/pmac_zilog.h drivers/tty/serial/pmac_zilog.h
drivers/serial/pnx8xxx_uart.c drivers/tty/serial/pnx8xxx_uart.c
drivers/serial/pxa.c drivers/tty/serial/pxa.c
drivers/serial/s3c2400.c drivers/tty/serial/s3c2400.c
drivers/serial/s3c2410.c drivers/tty/serial/s3c2410.c
drivers/serial/s3c2412.c drivers/tty/serial/s3c2412.c
drivers/serial/s3c2440.c drivers/tty/serial/s3c2440.c
drivers/serial/s3c24a0.c drivers/tty/serial/s3c24a0.c
drivers/serial/s3c6400.c drivers/tty/serial/s3c6400.c
drivers/serial/s5pv210.c drivers/tty/serial/s5pv210.c
drivers/serial/sa1100.c drivers/tty/serial/sa1100.c
drivers/serial/samsung.c drivers/tty/serial/samsung.c
drivers/serial/samsung.h drivers/tty/serial/samsung.h
drivers/serial/sb1250-duart.c drivers/tty/serial/sb1250-duart.c
drivers/serial/sc26xx.c drivers/tty/serial/sc26xx.c
drivers/serial/serial_core.c drivers/tty/serial/serial_core.c
drivers/serial/serial_cs.c drivers/tty/serial/serial_cs.c
drivers/serial/serial_ks8695.c drivers/tty/serial/serial_ks8695.c
drivers/serial/serial_lh7a40x.c drivers/tty/serial/serial_lh7a40x.c
drivers/serial/serial_txx9.c drivers/tty/serial/serial_txx9.c
drivers/serial/sh-sci.c drivers/tty/serial/sh-sci.c
drivers/serial/sh-sci.h drivers/tty/serial/sh-sci.h
drivers/serial/sn_console.c drivers/tty/serial/sn_console.c
drivers/serial/suncore.c drivers/tty/serial/suncore.c
drivers/serial/suncore.h drivers/tty/serial/suncore.h
drivers/serial/sunhv.c drivers/tty/serial/sunhv.c
drivers/serial/sunsab.c drivers/tty/serial/sunsab.c
drivers/serial/sunsab.h drivers/tty/serial/sunsab.h
drivers/serial/sunsu.c drivers/tty/serial/sunsu.c
drivers/serial/sunzilog.c drivers/tty/serial/sunzilog.c
drivers/serial/sunzilog.h drivers/tty/serial/sunzilog.h
drivers/serial/timbuart.c drivers/tty/serial/timbuart.c
drivers/serial/timbuart.h drivers/tty/serial/timbuart.h
drivers/serial/uartlite.c drivers/tty/serial/uartlite.c
drivers/serial/ucc_uart.c drivers/tty/serial/ucc_uart.c
drivers/serial/vr41xx_siu.c drivers/tty/serial/vr41xx_siu.c
drivers/serial/vt8500_serial.c drivers/tty/serial/vt8500_serial.c
drivers/serial/zs.c drivers/tty/serial/zs.c
drivers/serial/zs.h drivers/tty/serial/zs.h
+2
drivers/tty/Makefile
··· 9 9 obj-$(CONFIG_R3964) += n_r3964.o 10 10 11 11 obj-y += vt/ 12 + obj-$(CONFIG_HVC_DRIVER) += hvc/ 13 + obj-y += serial/
+13
drivers/tty/hvc/Makefile
··· 1 + obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o 2 + obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o 3 + obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o 4 + obj-$(CONFIG_HVC_TILE) += hvc_tile.o 5 + obj-$(CONFIG_HVC_DCC) += hvc_dcc.o 6 + obj-$(CONFIG_HVC_BEAT) += hvc_beat.o 7 + obj-$(CONFIG_HVC_DRIVER) += hvc_console.o 8 + obj-$(CONFIG_HVC_IRQ) += hvc_irq.o 9 + obj-$(CONFIG_HVC_XEN) += hvc_xen.o 10 + obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o 11 + obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o 12 + obj-$(CONFIG_HVCS) += hvcs.o 13 + obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o