diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 16:39:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 16:39:23 -0800 |
| commit | fc887b15d935ead2a00aef5779a18034e7c69ee1 (patch) | |
| tree | 30daa1c9bafbf179047047c67d11ccd98e27d809 /drivers | |
| parent | 466c19063b4b426d5c362572787cb249fbf4296b (diff) | |
| parent | df6212529c646710502657b18d8f42927f3dda81 (diff) | |
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/
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 3 | ||||
| -rw-r--r-- | drivers/char/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/char/Makefile | 13 | ||||
| -rw-r--r-- | drivers/tty/Makefile | 2 | ||||
| -rw-r--r-- | drivers/tty/hvc/Makefile | 13 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_beat.c (renamed from drivers/char/hvc_beat.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_console.c (renamed from drivers/char/hvc_console.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_console.h (renamed from drivers/char/hvc_console.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_dcc.c (renamed from drivers/char/hvc_dcc.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_irq.c (renamed from drivers/char/hvc_irq.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_iseries.c (renamed from drivers/char/hvc_iseries.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_iucv.c (renamed from drivers/char/hvc_iucv.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_rtas.c (renamed from drivers/char/hvc_rtas.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_tile.c (renamed from drivers/char/hvc_tile.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_udbg.c (renamed from drivers/char/hvc_udbg.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_vio.c (renamed from drivers/char/hvc_vio.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_xen.c (renamed from drivers/char/hvc_xen.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvcs.c (renamed from drivers/char/hvcs.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvsi.c (renamed from drivers/char/hvsi.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/hvc/virtio_console.c (renamed from drivers/char/virtio_console.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/21285.c (renamed from drivers/serial/21285.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/68328serial.c (renamed from drivers/serial/68328serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/68328serial.h (renamed from drivers/serial/68328serial.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/68360serial.c (renamed from drivers/serial/68360serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250.c (renamed from drivers/serial/8250.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250.h (renamed from drivers/serial/8250.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_accent.c (renamed from drivers/serial/8250_accent.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_acorn.c (renamed from drivers/serial/8250_acorn.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_boca.c (renamed from drivers/serial/8250_boca.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_early.c (renamed from drivers/serial/8250_early.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_exar_st16c554.c (renamed from drivers/serial/8250_exar_st16c554.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_fourport.c (renamed from drivers/serial/8250_fourport.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_gsc.c (renamed from drivers/serial/8250_gsc.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_hp300.c (renamed from drivers/serial/8250_hp300.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_hub6.c (renamed from drivers/serial/8250_hub6.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_mca.c (renamed from drivers/serial/8250_mca.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_pci.c (renamed from drivers/serial/8250_pci.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/8250_pnp.c (renamed from drivers/serial/8250_pnp.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/Kconfig (renamed from drivers/serial/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/Makefile (renamed from drivers/serial/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/altera_jtaguart.c (renamed from drivers/serial/altera_jtaguart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/altera_uart.c (renamed from drivers/serial/altera_uart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/amba-pl010.c (renamed from drivers/serial/amba-pl010.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c (renamed from drivers/serial/amba-pl011.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/apbuart.c (renamed from drivers/serial/apbuart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/apbuart.h (renamed from drivers/serial/apbuart.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c (renamed from drivers/serial/atmel_serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/bcm63xx_uart.c (renamed from drivers/serial/bcm63xx_uart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/bfin_5xx.c (renamed from drivers/serial/bfin_5xx.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/bfin_sport_uart.c (renamed from drivers/serial/bfin_sport_uart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/bfin_sport_uart.h (renamed from drivers/serial/bfin_sport_uart.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/clps711x.c (renamed from drivers/serial/clps711x.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/Makefile (renamed from drivers/serial/cpm_uart/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart.h (renamed from drivers/serial/cpm_uart/cpm_uart.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_core.c (renamed from drivers/serial/cpm_uart/cpm_uart_core.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c (renamed from drivers/serial/cpm_uart/cpm_uart_cpm1.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h (renamed from drivers/serial/cpm_uart/cpm_uart_cpm1.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c (renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h (renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/crisv10.c (renamed from drivers/serial/crisv10.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/crisv10.h (renamed from drivers/serial/crisv10.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/dz.c (renamed from drivers/serial/dz.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/dz.h (renamed from drivers/serial/dz.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/icom.c (renamed from drivers/serial/icom.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/icom.h (renamed from drivers/serial/icom.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/ifx6x60.c (renamed from drivers/serial/ifx6x60.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/ifx6x60.h (renamed from drivers/serial/ifx6x60.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/imx.c (renamed from drivers/serial/imx.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/ioc3_serial.c (renamed from drivers/serial/ioc3_serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/ioc4_serial.c (renamed from drivers/serial/ioc4_serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/ip22zilog.c (renamed from drivers/serial/ip22zilog.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/ip22zilog.h (renamed from drivers/serial/ip22zilog.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/jsm/Makefile (renamed from drivers/serial/jsm/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/jsm/jsm.h (renamed from drivers/serial/jsm/jsm.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/jsm/jsm_driver.c (renamed from drivers/serial/jsm/jsm_driver.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/jsm/jsm_neo.c (renamed from drivers/serial/jsm/jsm_neo.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/jsm/jsm_tty.c (renamed from drivers/serial/jsm/jsm_tty.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/kgdboc.c (renamed from drivers/serial/kgdboc.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/m32r_sio.c (renamed from drivers/serial/m32r_sio.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/m32r_sio.h (renamed from drivers/serial/m32r_sio.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/m32r_sio_reg.h (renamed from drivers/serial/m32r_sio_reg.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/max3100.c (renamed from drivers/serial/max3100.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/max3107-aava.c (renamed from drivers/serial/max3107-aava.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/max3107.c (renamed from drivers/serial/max3107.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/max3107.h (renamed from drivers/serial/max3107.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/mcf.c (renamed from drivers/serial/mcf.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/mfd.c (renamed from drivers/serial/mfd.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/mpc52xx_uart.c (renamed from drivers/serial/mpc52xx_uart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/mpsc.c (renamed from drivers/serial/mpsc.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/mrst_max3110.c (renamed from drivers/serial/mrst_max3110.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/mrst_max3110.h (renamed from drivers/serial/mrst_max3110.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/msm_serial.c (renamed from drivers/serial/msm_serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/msm_serial.h (renamed from drivers/serial/msm_serial.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/mux.c (renamed from drivers/serial/mux.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/netx-serial.c (renamed from drivers/serial/netx-serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/nwpserial.c (renamed from drivers/serial/nwpserial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/of_serial.c (renamed from drivers/serial/of_serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/omap-serial.c (renamed from drivers/serial/omap-serial.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/pch_uart.c (renamed from drivers/serial/pch_uart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/pmac_zilog.c (renamed from drivers/serial/pmac_zilog.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/pmac_zilog.h (renamed from drivers/serial/pmac_zilog.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/pnx8xxx_uart.c (renamed from drivers/serial/pnx8xxx_uart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/pxa.c (renamed from drivers/serial/pxa.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/s3c2400.c (renamed from drivers/serial/s3c2400.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/s3c2410.c (renamed from drivers/serial/s3c2410.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/s3c2412.c (renamed from drivers/serial/s3c2412.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/s3c2440.c (renamed from drivers/serial/s3c2440.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/s3c24a0.c (renamed from drivers/serial/s3c24a0.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/s3c6400.c (renamed from drivers/serial/s3c6400.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/s5pv210.c (renamed from drivers/serial/s5pv210.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sa1100.c (renamed from drivers/serial/sa1100.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/samsung.c (renamed from drivers/serial/samsung.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/samsung.h (renamed from drivers/serial/samsung.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sb1250-duart.c (renamed from drivers/serial/sb1250-duart.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sc26xx.c (renamed from drivers/serial/sc26xx.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_core.c (renamed from drivers/serial/serial_core.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_cs.c (renamed from drivers/serial/serial_cs.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_ks8695.c (renamed from drivers/serial/serial_ks8695.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_lh7a40x.c (renamed from drivers/serial/serial_lh7a40x.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_txx9.c (renamed from drivers/serial/serial_txx9.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sh-sci.c (renamed from drivers/serial/sh-sci.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sh-sci.h (renamed from drivers/serial/sh-sci.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sn_console.c (renamed from drivers/serial/sn_console.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/suncore.c (renamed from drivers/serial/suncore.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/suncore.h (renamed from drivers/serial/suncore.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sunhv.c (renamed from drivers/serial/sunhv.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sunsab.c (renamed from drivers/serial/sunsab.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sunsab.h (renamed from drivers/serial/sunsab.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sunsu.c (renamed from drivers/serial/sunsu.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/serial/sunzilog.c (renamed from drivers/serial/sunzilog.c) | 0 |