Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Fri, 21 Jan 2011 00:39:23 +0000 (16:39 -0800)]
* '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/

140 files changed:
MAINTAINERS
drivers/Makefile
drivers/char/Kconfig
drivers/char/Makefile
drivers/tty/Makefile
drivers/tty/hvc/Makefile [new file with mode: 0644]
drivers/tty/hvc/hvc_beat.c [moved from drivers/char/hvc_beat.c with 100% similarity]
drivers/tty/hvc/hvc_console.c [moved from drivers/char/hvc_console.c with 100% similarity]
drivers/tty/hvc/hvc_console.h [moved from drivers/char/hvc_console.h with 100% similarity]
drivers/tty/hvc/hvc_dcc.c [moved from drivers/char/hvc_dcc.c with 100% similarity]
drivers/tty/hvc/hvc_irq.c [moved from drivers/char/hvc_irq.c with 100% similarity]
drivers/tty/hvc/hvc_iseries.c [moved from drivers/char/hvc_iseries.c with 100% similarity]
drivers/tty/hvc/hvc_iucv.c [moved from drivers/char/hvc_iucv.c with 100% similarity]
drivers/tty/hvc/hvc_rtas.c [moved from drivers/char/hvc_rtas.c with 100% similarity]
drivers/tty/hvc/hvc_tile.c [moved from drivers/char/hvc_tile.c with 100% similarity]
drivers/tty/hvc/hvc_udbg.c [moved from drivers/char/hvc_udbg.c with 100% similarity]
drivers/tty/hvc/hvc_vio.c [moved from drivers/char/hvc_vio.c with 100% similarity]
drivers/tty/hvc/hvc_xen.c [moved from drivers/char/hvc_xen.c with 100% similarity]
drivers/tty/hvc/hvcs.c [moved from drivers/char/hvcs.c with 100% similarity]
drivers/tty/hvc/hvsi.c [moved from drivers/char/hvsi.c with 100% similarity]
drivers/tty/hvc/virtio_console.c [moved from drivers/char/virtio_console.c with 100% similarity]
drivers/tty/serial/21285.c [moved from drivers/serial/21285.c with 100% similarity]
drivers/tty/serial/68328serial.c [moved from drivers/serial/68328serial.c with 100% similarity]
drivers/tty/serial/68328serial.h [moved from drivers/serial/68328serial.h with 100% similarity]
drivers/tty/serial/68360serial.c [moved from drivers/serial/68360serial.c with 100% similarity]
drivers/tty/serial/8250.c [moved from drivers/serial/8250.c with 100% similarity]
drivers/tty/serial/8250.h [moved from drivers/serial/8250.h with 100% similarity]
drivers/tty/serial/8250_accent.c [moved from drivers/serial/8250_accent.c with 100% similarity]
drivers/tty/serial/8250_acorn.c [moved from drivers/serial/8250_acorn.c with 100% similarity]
drivers/tty/serial/8250_boca.c [moved from drivers/serial/8250_boca.c with 100% similarity]
drivers/tty/serial/8250_early.c [moved from drivers/serial/8250_early.c with 100% similarity]
drivers/tty/serial/8250_exar_st16c554.c [moved from drivers/serial/8250_exar_st16c554.c with 100% similarity]
drivers/tty/serial/8250_fourport.c [moved from drivers/serial/8250_fourport.c with 100% similarity]
drivers/tty/serial/8250_gsc.c [moved from drivers/serial/8250_gsc.c with 100% similarity]
drivers/tty/serial/8250_hp300.c [moved from drivers/serial/8250_hp300.c with 100% similarity]
drivers/tty/serial/8250_hub6.c [moved from drivers/serial/8250_hub6.c with 100% similarity]
drivers/tty/serial/8250_mca.c [moved from drivers/serial/8250_mca.c with 100% similarity]
drivers/tty/serial/8250_pci.c [moved from drivers/serial/8250_pci.c with 100% similarity]
drivers/tty/serial/8250_pnp.c [moved from drivers/serial/8250_pnp.c with 100% similarity]
drivers/tty/serial/Kconfig [moved from drivers/serial/Kconfig with 100% similarity]
drivers/tty/serial/Makefile [moved from drivers/serial/Makefile with 100% similarity]
drivers/tty/serial/altera_jtaguart.c [moved from drivers/serial/altera_jtaguart.c with 100% similarity]
drivers/tty/serial/altera_uart.c [moved from drivers/serial/altera_uart.c with 100% similarity]
drivers/tty/serial/amba-pl010.c [moved from drivers/serial/amba-pl010.c with 100% similarity]
drivers/tty/serial/amba-pl011.c [moved from drivers/serial/amba-pl011.c with 100% similarity]
drivers/tty/serial/apbuart.c [moved from drivers/serial/apbuart.c with 100% similarity]
drivers/tty/serial/apbuart.h [moved from drivers/serial/apbuart.h with 100% similarity]
drivers/tty/serial/atmel_serial.c [moved from drivers/serial/atmel_serial.c with 100% similarity]
drivers/tty/serial/bcm63xx_uart.c [moved from drivers/serial/bcm63xx_uart.c with 100% similarity]
drivers/tty/serial/bfin_5xx.c [moved from drivers/serial/bfin_5xx.c with 100% similarity]
drivers/tty/serial/bfin_sport_uart.c [moved from drivers/serial/bfin_sport_uart.c with 100% similarity]
drivers/tty/serial/bfin_sport_uart.h [moved from drivers/serial/bfin_sport_uart.h with 100% similarity]
drivers/tty/serial/clps711x.c [moved from drivers/serial/clps711x.c with 100% similarity]
drivers/tty/serial/cpm_uart/Makefile [moved from drivers/serial/cpm_uart/Makefile with 100% similarity]
drivers/tty/serial/cpm_uart/cpm_uart.h [moved from drivers/serial/cpm_uart/cpm_uart.h with 100% similarity]
drivers/tty/serial/cpm_uart/cpm_uart_core.c [moved from drivers/serial/cpm_uart/cpm_uart_core.c with 100% similarity]
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c [moved from drivers/serial/cpm_uart/cpm_uart_cpm1.c with 100% similarity]
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h [moved from drivers/serial/cpm_uart/cpm_uart_cpm1.h with 100% similarity]
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c [moved from drivers/serial/cpm_uart/cpm_uart_cpm2.c with 100% similarity]
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h [moved from drivers/serial/cpm_uart/cpm_uart_cpm2.h with 100% similarity]
drivers/tty/serial/crisv10.c [moved from drivers/serial/crisv10.c with 100% similarity]
drivers/tty/serial/crisv10.h [moved from drivers/serial/crisv10.h with 100% similarity]
drivers/tty/serial/dz.c [moved from drivers/serial/dz.c with 100% similarity]
drivers/tty/serial/dz.h [moved from drivers/serial/dz.h with 100% similarity]
drivers/tty/serial/icom.c [moved from drivers/serial/icom.c with 100% similarity]
drivers/tty/serial/icom.h [moved from drivers/serial/icom.h with 100% similarity]
drivers/tty/serial/ifx6x60.c [moved from drivers/serial/ifx6x60.c with 100% similarity]
drivers/tty/serial/ifx6x60.h [moved from drivers/serial/ifx6x60.h with 100% similarity]
drivers/tty/serial/imx.c [moved from drivers/serial/imx.c with 100% similarity]
drivers/tty/serial/ioc3_serial.c [moved from drivers/serial/ioc3_serial.c with 100% similarity]
drivers/tty/serial/ioc4_serial.c [moved from drivers/serial/ioc4_serial.c with 100% similarity]
drivers/tty/serial/ip22zilog.c [moved from drivers/serial/ip22zilog.c with 100% similarity]
drivers/tty/serial/ip22zilog.h [moved from drivers/serial/ip22zilog.h with 100% similarity]
drivers/tty/serial/jsm/Makefile [moved from drivers/serial/jsm/Makefile with 100% similarity]
drivers/tty/serial/jsm/jsm.h [moved from drivers/serial/jsm/jsm.h with 100% similarity]
drivers/tty/serial/jsm/jsm_driver.c [moved from drivers/serial/jsm/jsm_driver.c with 100% similarity]
drivers/tty/serial/jsm/jsm_neo.c [moved from drivers/serial/jsm/jsm_neo.c with 100% similarity]
drivers/tty/serial/jsm/jsm_tty.c [moved from drivers/serial/jsm/jsm_tty.c with 100% similarity]
drivers/tty/serial/kgdboc.c [moved from drivers/serial/kgdboc.c with 100% similarity]
drivers/tty/serial/m32r_sio.c [moved from drivers/serial/m32r_sio.c with 100% similarity]
drivers/tty/serial/m32r_sio.h [moved from drivers/serial/m32r_sio.h with 100% similarity]
drivers/tty/serial/m32r_sio_reg.h [moved from drivers/serial/m32r_sio_reg.h with 100% similarity]
drivers/tty/serial/max3100.c [moved from drivers/serial/max3100.c with 100% similarity]
drivers/tty/serial/max3107-aava.c [moved from drivers/serial/max3107-aava.c with 100% similarity]
drivers/tty/serial/max3107.c [moved from drivers/serial/max3107.c with 100% similarity]
drivers/tty/serial/max3107.h [moved from drivers/serial/max3107.h with 100% similarity]
drivers/tty/serial/mcf.c [moved from drivers/serial/mcf.c with 100% similarity]
drivers/tty/serial/mfd.c [moved from drivers/serial/mfd.c with 100% similarity]
drivers/tty/serial/mpc52xx_uart.c [moved from drivers/serial/mpc52xx_uart.c with 100% similarity]
drivers/tty/serial/mpsc.c [moved from drivers/serial/mpsc.c with 100% similarity]
drivers/tty/serial/mrst_max3110.c [moved from drivers/serial/mrst_max3110.c with 100% similarity]
drivers/tty/serial/mrst_max3110.h [moved from drivers/serial/mrst_max3110.h with 100% similarity]
drivers/tty/serial/msm_serial.c [moved from drivers/serial/msm_serial.c with 100% similarity]
drivers/tty/serial/msm_serial.h [moved from drivers/serial/msm_serial.h with 100% similarity]
drivers/tty/serial/mux.c [moved from drivers/serial/mux.c with 100% similarity]
drivers/tty/serial/netx-serial.c [moved from drivers/serial/netx-serial.c with 100% similarity]
drivers/tty/serial/nwpserial.c [moved from drivers/serial/nwpserial.c with 100% similarity]
drivers/tty/serial/of_serial.c [moved from drivers/serial/of_serial.c with 100% similarity]
drivers/tty/serial/omap-serial.c [moved from drivers/serial/omap-serial.c with 100% similarity]
drivers/tty/serial/pch_uart.c [moved from drivers/serial/pch_uart.c with 100% similarity]
drivers/tty/serial/pmac_zilog.c [moved from drivers/serial/pmac_zilog.c with 100% similarity]
drivers/tty/serial/pmac_zilog.h [moved from drivers/serial/pmac_zilog.h with 100% similarity]
drivers/tty/serial/pnx8xxx_uart.c [moved from drivers/serial/pnx8xxx_uart.c with 100% similarity]
drivers/tty/serial/pxa.c [moved from drivers/serial/pxa.c with 100% similarity]
drivers/tty/serial/s3c2400.c [moved from drivers/serial/s3c2400.c with 100% similarity]
drivers/tty/serial/s3c2410.c [moved from drivers/serial/s3c2410.c with 100% similarity]
drivers/tty/serial/s3c2412.c [moved from drivers/serial/s3c2412.c with 100% similarity]
drivers/tty/serial/s3c2440.c [moved from drivers/serial/s3c2440.c with 100% similarity]
drivers/tty/serial/s3c24a0.c [moved from drivers/serial/s3c24a0.c with 100% similarity]
drivers/tty/serial/s3c6400.c [moved from drivers/serial/s3c6400.c with 100% similarity]
drivers/tty/serial/s5pv210.c [moved from drivers/serial/s5pv210.c with 100% similarity]
drivers/tty/serial/sa1100.c [moved from drivers/serial/sa1100.c with 100% similarity]
drivers/tty/serial/samsung.c [moved from drivers/serial/samsung.c with 100% similarity]
drivers/tty/serial/samsung.h [moved from drivers/serial/samsung.h with 100% similarity]
drivers/tty/serial/sb1250-duart.c [moved from drivers/serial/sb1250-duart.c with 100% similarity]
drivers/tty/serial/sc26xx.c [moved from drivers/serial/sc26xx.c with 100% similarity]
drivers/tty/serial/serial_core.c [moved from drivers/serial/serial_core.c with 100% similarity]
drivers/tty/serial/serial_cs.c [moved from drivers/serial/serial_cs.c with 100% similarity]
drivers/tty/serial/serial_ks8695.c [moved from drivers/serial/serial_ks8695.c with 100% similarity]
drivers/tty/serial/serial_lh7a40x.c [moved from drivers/serial/serial_lh7a40x.c with 100% similarity]
drivers/tty/serial/serial_txx9.c [moved from drivers/serial/serial_txx9.c with 100% similarity]
drivers/tty/serial/sh-sci.c [moved from drivers/serial/sh-sci.c with 100% similarity]
drivers/tty/serial/sh-sci.h [moved from drivers/serial/sh-sci.h with 100% similarity]
drivers/tty/serial/sn_console.c [moved from drivers/serial/sn_console.c with 100% similarity]
drivers/tty/serial/suncore.c [moved from drivers/serial/suncore.c with 100% similarity]
drivers/tty/serial/suncore.h [moved from drivers/serial/suncore.h with 100% similarity]
drivers/tty/serial/sunhv.c [moved from drivers/serial/sunhv.c with 100% similarity]
drivers/tty/serial/sunsab.c [moved from drivers/serial/sunsab.c with 100% similarity]
drivers/tty/serial/sunsab.h [moved from drivers/serial/sunsab.h with 100% similarity]
drivers/tty/serial/sunsu.c [moved from drivers/serial/sunsu.c with 100% similarity]
drivers/tty/serial/sunzilog.c [moved from drivers/serial/sunzilog.c with 100% similarity]
drivers/tty/serial/sunzilog.h [moved from drivers/serial/sunzilog.h with 100% similarity]
drivers/tty/serial/timbuart.c [moved from drivers/serial/timbuart.c with 100% similarity]
drivers/tty/serial/timbuart.h [moved from drivers/serial/timbuart.h with 100% similarity]
drivers/tty/serial/uartlite.c [moved from drivers/serial/uartlite.c with 100% similarity]
drivers/tty/serial/ucc_uart.c [moved from drivers/serial/ucc_uart.c with 100% similarity]
drivers/tty/serial/vr41xx_siu.c [moved from drivers/serial/vr41xx_siu.c with 100% similarity]
drivers/tty/serial/vt8500_serial.c [moved from drivers/serial/vt8500_serial.c with 100% similarity]
drivers/tty/serial/zs.c [moved from drivers/serial/zs.c with 100% similarity]
drivers/tty/serial/zs.h [moved from drivers/serial/zs.h with 100% similarity]

index 1af022e..2e14fd7 100644 (file)
@@ -162,7 +162,7 @@ L:  linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F:     drivers/serial/8250*
+F:     drivers/tty/serial/8250*
 F:     include/linux/serial_8250.h
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
@@ -888,8 +888,8 @@ F:  arch/arm/mach-msm/
 F:     drivers/video/msm/
 F:     drivers/mmc/host/msm_sdcc.c
 F:     drivers/mmc/host/msm_sdcc.h
-F:     drivers/serial/msm_serial.h
-F:     drivers/serial/msm_serial.c
+F:     drivers/tty/serial/msm_serial.h
+F:     drivers/tty/serial/msm_serial.c
 T:     git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
 S:     Maintained
 
@@ -1256,7 +1256,7 @@ F:        drivers/mmc/host/atmel-mci-regs.h
 ATMEL AT91 / AT32 SERIAL DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
-F:     drivers/serial/atmel_serial.c
+F:     drivers/tty/serial/atmel_serial.c
 
 ATMEL LCDFB DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -1412,7 +1412,7 @@ M:        Sonic Zhang <sonic.zhang@analog.com>
 L:     uclinux-dist-devel@blackfin.uclinux.org
 W:     http://blackfin.uclinux.org
 S:     Supported
-F:     drivers/serial/bfin_5xx.c
+F:     drivers/tty/serial/bfin_5xx.c
 
 BLACKFIN WATCHDOG DRIVER
 M:     Mike Frysinger <vapier.adi@gmail.com>
@@ -1877,7 +1877,7 @@ L:        linux-cris-kernel@axis.com
 W:     http://developer.axis.com
 S:     Maintained
 F:     arch/cris/
-F:     drivers/serial/crisv10.*
+F:     drivers/tty/serial/crisv10.*
 
 CRYPTO API
 M:     Herbert Xu <herbert@gondor.apana.org.au>
@@ -2216,7 +2216,7 @@ F:        drivers/net/wan/dscc4.c
 DZ DECSTATION DZ11 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
-F:     drivers/serial/dz.*
+F:     drivers/tty/serial/dz.*
 
 EATA-DMA SCSI DRIVER
 M:     Michael Neuffer <mike@i-Connect.Net>
@@ -2643,7 +2643,7 @@ FREESCALE QUICC ENGINE UCC UART DRIVER
 M:     Timur Tabi <timur@freescale.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
-F:     drivers/serial/ucc_uart.c
+F:     drivers/tty/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
 M:     Timur Tabi <timur@freescale.com>
@@ -3350,7 +3350,7 @@ IOC3 SERIAL DRIVER
 M:     Pat Gefre <pfg@sgi.com>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
-F:     drivers/serial/ioc3_serial.c
+F:     drivers/tty/serial/ioc3_serial.c
 
 IP MASQUERADING
 M:     Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
@@ -3527,7 +3527,7 @@ JSM Neo PCI based serial card
 M:     Breno Leitao <leitao@linux.vnet.ibm.com>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
-F:     drivers/serial/jsm/
+F:     drivers/tty/serial/jsm/
 
 K10TEMP HARDWARE MONITORING DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
@@ -3677,7 +3677,7 @@ L:        kgdb-bugreport@lists.sourceforge.net
 S:     Maintained
 F:     Documentation/DocBook/kgdb.tmpl
 F:     drivers/misc/kgdbts.c
-F:     drivers/serial/kgdboc.c
+F:     drivers/tty/serial/kgdboc.c
 F:     include/linux/kdb.h
 F:     include/linux/kgdb.h
 F:     kernel/debug/
@@ -5545,7 +5545,7 @@ M:        Pat Gefre <pfg@sgi.com>
 L:     linux-ia64@vger.kernel.org
 S:     Supported
 F:     Documentation/ia64/serial.txt
-F:     drivers/serial/ioc?_serial.c
+F:     drivers/tty/serial/ioc?_serial.c
 F:     include/linux/ioc?.h
 
 SGI VISUAL WORKSTATION 320 AND 540
@@ -5567,7 +5567,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
 F:     arch/arm/mach-lh7a40x/
-F:     drivers/serial/serial_lh7a40x.c
+F:     drivers/tty/serial/serial_lh7a40x.c
 F:     drivers/usb/gadget/lh7a40*
 F:     drivers/usb/host/ohci-lh7a40*
 
@@ -5787,14 +5787,14 @@ L:      sparclinux@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:     Maintained
-F:     drivers/serial/suncore.c
-F:     drivers/serial/suncore.h
-F:     drivers/serial/sunhv.c
-F:     drivers/serial/sunsab.c
-F:     drivers/serial/sunsab.h
-F:     drivers/serial/sunsu.c
-F:     drivers/serial/sunzilog.c
-F:     drivers/serial/sunzilog.h
+F:     drivers/tty/serial/suncore.c
+F:     drivers/tty/serial/suncore.h
+F:     drivers/tty/serial/sunhv.c
+F:     drivers/tty/serial/sunsab.c
+F:     drivers/tty/serial/sunsab.h
+F:     drivers/tty/serial/sunsu.c
+F:     drivers/tty/serial/sunzilog.c
+F:     drivers/tty/serial/sunzilog.h
 
 SPEAR PLATFORM SUPPORT
 M:     Viresh Kumar <viresh.kumar@st.com>
@@ -6124,8 +6124,8 @@ TTY LAYER
 M:     Greg Kroah-Hartman <gregkh@suse.de>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F:     drivers/char/tty_*
-F:     drivers/serial/serial_core.c
+F:     drivers/tty/*
+F:     drivers/tty/serial/serial_core.c
 F:     include/linux/serial_core.h
 F:     include/linux/serial.h
 F:     include/linux/tty.h
@@ -6870,7 +6870,7 @@ XILINX UARTLITE SERIAL DRIVER
 M:     Peter Korsgaard <jacmet@sunsite.dk>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
-F:     drivers/serial/uartlite.c
+F:     drivers/tty/serial/uartlite.c
 
 YAM DRIVER FOR AX.25
 M:     Jean-Paul Roubelat <jpr@f6fbb.org>
@@ -6916,7 +6916,7 @@ F:        drivers/media/video/zoran/
 ZS DECSTATION Z85C30 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
-F:     drivers/serial/zs.*
+F:     drivers/tty/serial/zs.*
 
 GRE DEMULTIPLEXER DRIVER
 M:     Dmitry Kozlov <xeb@mail.ru>
index 7eb35f4..b423bb1 100644 (file)
@@ -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/
index 0f175a8..ccac7d0 100644 (file)
@@ -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
index 1e9dffb..5bc765d 100644 (file)
@@ -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
index c43ef48..3962772 100644 (file)
@@ -9,3 +9,5 @@ obj-$(CONFIG_N_GSM)             += n_gsm.o
 obj-$(CONFIG_R3964)            += n_r3964.o
 
 obj-y                          += vt/
+obj-$(CONFIG_HVC_DRIVER)       += hvc/
+obj-y                          += serial/
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
new file mode 100644 (file)
index 0000000..e6bed5f
--- /dev/null
@@ -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
similarity index 100%
rename from drivers/char/hvcs.c
rename to drivers/tty/hvc/hvcs.c
similarity index 100%
rename from drivers/char/hvsi.c
rename to drivers/tty/hvc/hvsi.c
similarity index 100%
rename from drivers/serial/dz.c
rename to drivers/tty/serial/dz.c
similarity index 100%
rename from drivers/serial/dz.h
rename to drivers/tty/serial/dz.h
similarity index 100%
rename from drivers/serial/zs.c
rename to drivers/tty/serial/zs.c
similarity index 100%
rename from drivers/serial/zs.h
rename to drivers/tty/serial/zs.h