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/
This commit is contained in:
commit
fc887b15d9
50
MAINTAINERS
50
MAINTAINERS
|
@ -162,7 +162,7 @@ L: linux-serial@vger.kernel.org
|
||||||
W: http://serial.sourceforge.net
|
W: http://serial.sourceforge.net
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
|
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
|
F: include/linux/serial_8250.h
|
||||||
|
|
||||||
8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
|
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/video/msm/
|
||||||
F: drivers/mmc/host/msm_sdcc.c
|
F: drivers/mmc/host/msm_sdcc.c
|
||||||
F: drivers/mmc/host/msm_sdcc.h
|
F: drivers/mmc/host/msm_sdcc.h
|
||||||
F: drivers/serial/msm_serial.h
|
F: drivers/tty/serial/msm_serial.h
|
||||||
F: drivers/serial/msm_serial.c
|
F: drivers/tty/serial/msm_serial.c
|
||||||
T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
|
T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
@ -1256,7 +1256,7 @@ F: drivers/mmc/host/atmel-mci-regs.h
|
||||||
ATMEL AT91 / AT32 SERIAL DRIVER
|
ATMEL AT91 / AT32 SERIAL DRIVER
|
||||||
M: Nicolas Ferre <nicolas.ferre@atmel.com>
|
M: Nicolas Ferre <nicolas.ferre@atmel.com>
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/serial/atmel_serial.c
|
F: drivers/tty/serial/atmel_serial.c
|
||||||
|
|
||||||
ATMEL LCDFB DRIVER
|
ATMEL LCDFB DRIVER
|
||||||
M: Nicolas Ferre <nicolas.ferre@atmel.com>
|
M: Nicolas Ferre <nicolas.ferre@atmel.com>
|
||||||
|
@ -1412,7 +1412,7 @@ M: Sonic Zhang <sonic.zhang@analog.com>
|
||||||
L: uclinux-dist-devel@blackfin.uclinux.org
|
L: uclinux-dist-devel@blackfin.uclinux.org
|
||||||
W: http://blackfin.uclinux.org
|
W: http://blackfin.uclinux.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/serial/bfin_5xx.c
|
F: drivers/tty/serial/bfin_5xx.c
|
||||||
|
|
||||||
BLACKFIN WATCHDOG DRIVER
|
BLACKFIN WATCHDOG DRIVER
|
||||||
M: Mike Frysinger <vapier.adi@gmail.com>
|
M: Mike Frysinger <vapier.adi@gmail.com>
|
||||||
|
@ -1877,7 +1877,7 @@ L: linux-cris-kernel@axis.com
|
||||||
W: http://developer.axis.com
|
W: http://developer.axis.com
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: arch/cris/
|
F: arch/cris/
|
||||||
F: drivers/serial/crisv10.*
|
F: drivers/tty/serial/crisv10.*
|
||||||
|
|
||||||
CRYPTO API
|
CRYPTO API
|
||||||
M: Herbert Xu <herbert@gondor.apana.org.au>
|
M: Herbert Xu <herbert@gondor.apana.org.au>
|
||||||
|
@ -2216,7 +2216,7 @@ F: drivers/net/wan/dscc4.c
|
||||||
DZ DECSTATION DZ11 SERIAL DRIVER
|
DZ DECSTATION DZ11 SERIAL DRIVER
|
||||||
M: "Maciej W. Rozycki" <macro@linux-mips.org>
|
M: "Maciej W. Rozycki" <macro@linux-mips.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/serial/dz.*
|
F: drivers/tty/serial/dz.*
|
||||||
|
|
||||||
EATA-DMA SCSI DRIVER
|
EATA-DMA SCSI DRIVER
|
||||||
M: Michael Neuffer <mike@i-Connect.Net>
|
M: Michael Neuffer <mike@i-Connect.Net>
|
||||||
|
@ -2643,7 +2643,7 @@ FREESCALE QUICC ENGINE UCC UART DRIVER
|
||||||
M: Timur Tabi <timur@freescale.com>
|
M: Timur Tabi <timur@freescale.com>
|
||||||
L: linuxppc-dev@lists.ozlabs.org
|
L: linuxppc-dev@lists.ozlabs.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/serial/ucc_uart.c
|
F: drivers/tty/serial/ucc_uart.c
|
||||||
|
|
||||||
FREESCALE SOC SOUND DRIVERS
|
FREESCALE SOC SOUND DRIVERS
|
||||||
M: Timur Tabi <timur@freescale.com>
|
M: Timur Tabi <timur@freescale.com>
|
||||||
|
@ -3350,7 +3350,7 @@ IOC3 SERIAL DRIVER
|
||||||
M: Pat Gefre <pfg@sgi.com>
|
M: Pat Gefre <pfg@sgi.com>
|
||||||
L: linux-serial@vger.kernel.org
|
L: linux-serial@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/serial/ioc3_serial.c
|
F: drivers/tty/serial/ioc3_serial.c
|
||||||
|
|
||||||
IP MASQUERADING
|
IP MASQUERADING
|
||||||
M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
|
M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
|
||||||
|
@ -3527,7 +3527,7 @@ JSM Neo PCI based serial card
|
||||||
M: Breno Leitao <leitao@linux.vnet.ibm.com>
|
M: Breno Leitao <leitao@linux.vnet.ibm.com>
|
||||||
L: linux-serial@vger.kernel.org
|
L: linux-serial@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/serial/jsm/
|
F: drivers/tty/serial/jsm/
|
||||||
|
|
||||||
K10TEMP HARDWARE MONITORING DRIVER
|
K10TEMP HARDWARE MONITORING DRIVER
|
||||||
M: Clemens Ladisch <clemens@ladisch.de>
|
M: Clemens Ladisch <clemens@ladisch.de>
|
||||||
|
@ -3677,7 +3677,7 @@ L: kgdb-bugreport@lists.sourceforge.net
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/DocBook/kgdb.tmpl
|
F: Documentation/DocBook/kgdb.tmpl
|
||||||
F: drivers/misc/kgdbts.c
|
F: drivers/misc/kgdbts.c
|
||||||
F: drivers/serial/kgdboc.c
|
F: drivers/tty/serial/kgdboc.c
|
||||||
F: include/linux/kdb.h
|
F: include/linux/kdb.h
|
||||||
F: include/linux/kgdb.h
|
F: include/linux/kgdb.h
|
||||||
F: kernel/debug/
|
F: kernel/debug/
|
||||||
|
@ -5545,7 +5545,7 @@ M: Pat Gefre <pfg@sgi.com>
|
||||||
L: linux-ia64@vger.kernel.org
|
L: linux-ia64@vger.kernel.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: Documentation/ia64/serial.txt
|
F: Documentation/ia64/serial.txt
|
||||||
F: drivers/serial/ioc?_serial.c
|
F: drivers/tty/serial/ioc?_serial.c
|
||||||
F: include/linux/ioc?.h
|
F: include/linux/ioc?.h
|
||||||
|
|
||||||
SGI VISUAL WORKSTATION 320 AND 540
|
SGI VISUAL WORKSTATION 320 AND 540
|
||||||
|
@ -5567,7 +5567,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
|
F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
|
||||||
F: arch/arm/mach-lh7a40x/
|
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/gadget/lh7a40*
|
||||||
F: drivers/usb/host/ohci-lh7a40*
|
F: drivers/usb/host/ohci-lh7a40*
|
||||||
|
|
||||||
|
@ -5787,14 +5787,14 @@ L: sparclinux@vger.kernel.org
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/serial/suncore.c
|
F: drivers/tty/serial/suncore.c
|
||||||
F: drivers/serial/suncore.h
|
F: drivers/tty/serial/suncore.h
|
||||||
F: drivers/serial/sunhv.c
|
F: drivers/tty/serial/sunhv.c
|
||||||
F: drivers/serial/sunsab.c
|
F: drivers/tty/serial/sunsab.c
|
||||||
F: drivers/serial/sunsab.h
|
F: drivers/tty/serial/sunsab.h
|
||||||
F: drivers/serial/sunsu.c
|
F: drivers/tty/serial/sunsu.c
|
||||||
F: drivers/serial/sunzilog.c
|
F: drivers/tty/serial/sunzilog.c
|
||||||
F: drivers/serial/sunzilog.h
|
F: drivers/tty/serial/sunzilog.h
|
||||||
|
|
||||||
SPEAR PLATFORM SUPPORT
|
SPEAR PLATFORM SUPPORT
|
||||||
M: Viresh Kumar <viresh.kumar@st.com>
|
M: Viresh Kumar <viresh.kumar@st.com>
|
||||||
|
@ -6124,8 +6124,8 @@ TTY LAYER
|
||||||
M: Greg Kroah-Hartman <gregkh@suse.de>
|
M: Greg Kroah-Hartman <gregkh@suse.de>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
|
||||||
F: drivers/char/tty_*
|
F: drivers/tty/*
|
||||||
F: drivers/serial/serial_core.c
|
F: drivers/tty/serial/serial_core.c
|
||||||
F: include/linux/serial_core.h
|
F: include/linux/serial_core.h
|
||||||
F: include/linux/serial.h
|
F: include/linux/serial.h
|
||||||
F: include/linux/tty.h
|
F: include/linux/tty.h
|
||||||
|
@ -6870,7 +6870,7 @@ XILINX UARTLITE SERIAL DRIVER
|
||||||
M: Peter Korsgaard <jacmet@sunsite.dk>
|
M: Peter Korsgaard <jacmet@sunsite.dk>
|
||||||
L: linux-serial@vger.kernel.org
|
L: linux-serial@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/serial/uartlite.c
|
F: drivers/tty/serial/uartlite.c
|
||||||
|
|
||||||
YAM DRIVER FOR AX.25
|
YAM DRIVER FOR AX.25
|
||||||
M: Jean-Paul Roubelat <jpr@f6fbb.org>
|
M: Jean-Paul Roubelat <jpr@f6fbb.org>
|
||||||
|
@ -6916,7 +6916,7 @@ F: drivers/media/video/zoran/
|
||||||
ZS DECSTATION Z85C30 SERIAL DRIVER
|
ZS DECSTATION Z85C30 SERIAL DRIVER
|
||||||
M: "Maciej W. Rozycki" <macro@linux-mips.org>
|
M: "Maciej W. Rozycki" <macro@linux-mips.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/serial/zs.*
|
F: drivers/tty/serial/zs.*
|
||||||
|
|
||||||
GRE DEMULTIPLEXER DRIVER
|
GRE DEMULTIPLEXER DRIVER
|
||||||
M: Dmitry Kozlov <xeb@mail.ru>
|
M: Dmitry Kozlov <xeb@mail.ru>
|
||||||
|
|
|
@ -24,7 +24,7 @@ obj-$(CONFIG_XEN) += xen/
|
||||||
# regulators early, since some subsystems rely on them to initialize
|
# regulators early, since some subsystems rely on them to initialize
|
||||||
obj-$(CONFIG_REGULATOR) += regulator/
|
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.
|
# default.
|
||||||
obj-y += tty/
|
obj-y += tty/
|
||||||
obj-y += char/
|
obj-y += char/
|
||||||
|
@ -38,7 +38,6 @@ obj-$(CONFIG_CONNECTOR) += connector/
|
||||||
obj-$(CONFIG_FB_I810) += video/i810/
|
obj-$(CONFIG_FB_I810) += video/i810/
|
||||||
obj-$(CONFIG_FB_INTEL) += video/intelfb/
|
obj-$(CONFIG_FB_INTEL) += video/intelfb/
|
||||||
|
|
||||||
obj-y += serial/
|
|
||||||
obj-$(CONFIG_PARPORT) += parport/
|
obj-$(CONFIG_PARPORT) += parport/
|
||||||
obj-y += base/ block/ misc/ mfd/ nfc/
|
obj-y += base/ block/ misc/ mfd/ nfc/
|
||||||
obj-$(CONFIG_NUBUS) += nubus/
|
obj-$(CONFIG_NUBUS) += nubus/
|
||||||
|
|
|
@ -426,7 +426,7 @@ config SGI_MBCS
|
||||||
If you have an SGI Altix with an attached SABrick
|
If you have an SGI Altix with an attached SABrick
|
||||||
say Y or M here, otherwise say N.
|
say Y or M here, otherwise say N.
|
||||||
|
|
||||||
source "drivers/serial/Kconfig"
|
source "drivers/tty/serial/Kconfig"
|
||||||
|
|
||||||
config UNIX98_PTYS
|
config UNIX98_PTYS
|
||||||
bool "Unix98 PTY support" if EMBEDDED
|
bool "Unix98 PTY support" if EMBEDDED
|
||||||
|
|
|
@ -30,25 +30,12 @@ obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
|
||||||
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
|
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
|
||||||
obj-$(CONFIG_SX) += sx.o generic_serial.o
|
obj-$(CONFIG_SX) += sx.o generic_serial.o
|
||||||
obj-$(CONFIG_RIO) += rio/ 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_RAW_DRIVER) += raw.o
|
||||||
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
|
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
|
||||||
obj-$(CONFIG_MSPEC) += mspec.o
|
obj-$(CONFIG_MSPEC) += mspec.o
|
||||||
obj-$(CONFIG_MMTIMER) += mmtimer.o
|
obj-$(CONFIG_MMTIMER) += mmtimer.o
|
||||||
obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
|
obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
|
||||||
obj-$(CONFIG_VIOTAPE) += viotape.o
|
obj-$(CONFIG_VIOTAPE) += viotape.o
|
||||||
obj-$(CONFIG_HVCS) += hvcs.o
|
|
||||||
obj-$(CONFIG_IBM_BSR) += bsr.o
|
obj-$(CONFIG_IBM_BSR) += bsr.o
|
||||||
obj-$(CONFIG_SGI_MBCS) += mbcs.o
|
obj-$(CONFIG_SGI_MBCS) += mbcs.o
|
||||||
obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
|
obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
|
||||||
|
|
|
@ -9,3 +9,5 @@ obj-$(CONFIG_N_GSM) += n_gsm.o
|
||||||
obj-$(CONFIG_R3964) += n_r3964.o
|
obj-$(CONFIG_R3964) += n_r3964.o
|
||||||
|
|
||||||
obj-y += vt/
|
obj-y += vt/
|
||||||
|
obj-$(CONFIG_HVC_DRIVER) += hvc/
|
||||||
|
obj-y += serial/
|
||||||
|
|
13
drivers/tty/hvc/Makefile
Normal file
13
drivers/tty/hvc/Makefile
Normal file
|
@ -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
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue