diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 15:11:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 15:11:04 -0700 |
| commit | e6bee325e49f17c65c1fd66e9e8b348c85788341 (patch) | |
| tree | bcc9e5d8e82efa9009edd481a837cc3626360091 /drivers | |
| parent | a5e6b135bdff649e4330f98e2e80dbb1984f7e77 (diff) | |
| parent | 6ae705b23be8da52d3163be9d81e9b767876aaf9 (diff) | |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
pch_uart: reference clock on CM-iTC
pch_phub: add new device ML7213
n_gsm: fix UIH control byte : P bit should be 0
n_gsm: add a documentation
serial: msm_serial_hs: Add MSM high speed UART driver
tty_audit: fix tty_audit_add_data live lock on audit disabled
tty: move cd1865.h to drivers/staging/tty/
Staging: tty: fix build with epca.c driver
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
Staging: generic_serial: fix double locking bug
nozomi: don't use flush_scheduled_work()
tty/serial: Relax the device_type restriction from of_serial
MAINTAINERS: Update HVC file patterns
tty: phase out of ioctl file pointer for tty3270 as well
tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
pch_uart: Fix DMA channel miss-setting issue.
pch_uart: fix exclusive access issue
pch_uart: fix auto flow control miss-setting issue
pch_uart: fix uart clock setting issue
pch_uart : Use dev_xxx not pr_xxx
...
Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/hci_ath.c | 26 | ||||
| -rw-r--r-- | drivers/char/Kconfig | 540 | ||||
| -rw-r--r-- | drivers/char/Makefile | 24 | ||||
| -rw-r--r-- | drivers/char/pcmcia/Makefile | 2 | ||||
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 13 | ||||
| -rw-r--r-- | drivers/char/ttyprintk.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/capi/capi.c | 10 | ||||
| -rw-r--r-- | drivers/isdn/gigaset/interface.c | 12 | ||||
| -rw-r--r-- | drivers/isdn/gigaset/ser-gigaset.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_tty.c | 7 | ||||
| -rw-r--r-- | drivers/misc/pch_phub.c | 20 | ||||
| -rw-r--r-- | drivers/mmc/card/sdio_uart.c | 4 | ||||
| -rw-r--r-- | drivers/net/irda/irtty-sir.c | 2 | ||||
| -rw-r--r-- | drivers/net/usb/hso.c | 10 | ||||
| -rw-r--r-- | drivers/net/wan/pc300_tty.c | 9 | ||||
| -rw-r--r-- | drivers/s390/char/keyboard.c | 4 | ||||
| -rw-r--r-- | drivers/s390/char/keyboard.h | 2 | ||||
| -rw-r--r-- | drivers/s390/char/tty3270.c | 14 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/Kconfig | 45 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/Makefile | 6 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/TODO | 6 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/generic_serial.c (renamed from drivers/char/generic_serial.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/Makefile (renamed from drivers/char/rio/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/board.h (renamed from drivers/char/rio/board.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/cirrus.h (renamed from drivers/char/rio/cirrus.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/cmdblk.h (renamed from drivers/char/rio/cmdblk.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/cmdpkt.h (renamed from drivers/char/rio/cmdpkt.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/daemon.h (renamed from drivers/char/rio/daemon.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/errors.h (renamed from drivers/char/rio/errors.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/func.h (renamed from drivers/char/rio/func.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/host.h (renamed from drivers/char/rio/host.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/link.h (renamed from drivers/char/rio/link.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/linux_compat.h (renamed from drivers/char/rio/linux_compat.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/map.h (renamed from drivers/char/rio/map.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/param.h (renamed from drivers/char/rio/param.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/parmmap.h (renamed from drivers/char/rio/parmmap.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/pci.h (renamed from drivers/char/rio/pci.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/phb.h (renamed from drivers/char/rio/phb.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/pkt.h (renamed from drivers/char/rio/pkt.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/port.h (renamed from drivers/char/rio/port.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/protsts.h (renamed from drivers/char/rio/protsts.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rio.h (renamed from drivers/char/rio/rio.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rio_linux.c (renamed from drivers/char/rio/rio_linux.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rio_linux.h (renamed from drivers/char/rio/rio_linux.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioboard.h (renamed from drivers/char/rio/rioboard.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioboot.c (renamed from drivers/char/rio/rioboot.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riocmd.c (renamed from drivers/char/rio/riocmd.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioctrl.c (renamed from drivers/char/rio/rioctrl.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riodrvr.h (renamed from drivers/char/rio/riodrvr.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioinfo.h (renamed from drivers/char/rio/rioinfo.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioinit.c (renamed from drivers/char/rio/rioinit.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riointr.c (renamed from drivers/char/rio/riointr.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioioctl.h (renamed from drivers/char/rio/rioioctl.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioparam.c (renamed from drivers/char/rio/rioparam.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rioroute.c (renamed from drivers/char/rio/rioroute.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riospace.h (renamed from drivers/char/rio/riospace.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riotable.c (renamed from drivers/char/rio/riotable.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/riotty.c (renamed from drivers/char/rio/riotty.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/route.h (renamed from drivers/char/rio/route.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/rup.h (renamed from drivers/char/rio/rup.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/rio/unixrup.h (renamed from drivers/char/rio/unixrup.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232.c (renamed from drivers/char/ser_a2232.c) | 6 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232.h (renamed from drivers/char/ser_a2232.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232fw.ax (renamed from drivers/char/ser_a2232fw.ax) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/ser_a2232fw.h (renamed from drivers/char/ser_a2232fw.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sx.c (renamed from drivers/char/sx.c) | 8 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sx.h (renamed from drivers/char/sx.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sxboards.h (renamed from drivers/char/sxboards.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/sxwindow.h (renamed from drivers/char/sxwindow.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/generic_serial/vme_scc.c (renamed from drivers/char/vme_scc.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/quatech_usb2/quatech_usb2.c | 6 | ||||
| -rw-r--r-- | drivers/staging/serqt_usb2/serqt_usb2.c | 13 | ||||
| -rw-r--r-- | drivers/staging/tty/Kconfig | 87 | ||||
| -rw-r--r-- | drivers/staging/tty/Makefile | 7 | ||||
| -rw-r--r-- | drivers/staging/tty/TODO | 6 | ||||
| -rw-r--r-- | drivers/staging/tty/cd1865.h (renamed from drivers/char/cd1865.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/digi1.h (renamed from drivers/char/digi1.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/digiFep1.h (renamed from drivers/char/digiFep1.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/digiPCI.h (renamed from drivers/char/digiPCI.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/epca.c (renamed from drivers/char/epca.c) | 16 | ||||
| -rw-r--r-- | drivers/staging/tty/epca.h (renamed from drivers/char/epca.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/epcaconfig.h (renamed from drivers/char/epcaconfig.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/Makefile (renamed from drivers/char/ip2/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2cmd.c (renamed from drivers/char/ip2/i2cmd.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2cmd.h (renamed from drivers/char/ip2/i2cmd.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2ellis.c (renamed from drivers/char/ip2/i2ellis.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2ellis.h (renamed from drivers/char/ip2/i2ellis.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2hw.h (renamed from drivers/char/ip2/i2hw.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2lib.c (renamed from drivers/char/ip2/i2lib.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2lib.h (renamed from drivers/char/ip2/i2lib.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/i2pack.h (renamed from drivers/char/ip2/i2pack.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/ip2.h (renamed from drivers/char/ip2/ip2.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/ip2ioctl.h (renamed from drivers/char/ip2/ip2ioctl.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/ip2main.c (renamed from drivers/char/ip2/ip2main.c) | 12 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/ip2trace.h (renamed from drivers/char/ip2/ip2trace.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/ip2/ip2types.h (renamed from drivers/char/ip2/ip2types.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/istallion.c (renamed from drivers/char/istallion.c) | 8 | ||||
| -rw-r--r-- | drivers/staging/tty/riscom8.c (renamed from drivers/char/riscom8.c) | 8 | ||||
| -rw-r--r-- | drivers/staging/tty/riscom8.h (renamed from drivers/char/riscom8.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/riscom8_reg.h (renamed from drivers/char/riscom8_reg.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/serial167.c (renamed from drivers/char/serial167.c) | 7 | ||||
| -rw-r--r-- | drivers/staging/tty/specialix.c (renamed from drivers/char/specialix.c) | 6 | ||||
| -rw-r--r-- | drivers/staging/tty/specialix_io8.h (renamed from drivers/char/specialix_io8.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/tty/stallion.c (renamed from drivers/char/stallion.c) | 9 | ||||
| -rw-r--r-- | drivers/tty/Kconfig | 321 | ||||
| -rw-r--r-- | drivers/tty/Makefile | 15 | ||||
| -rw-r--r-- | drivers/tty/amiserial.c (renamed from drivers/char/amiserial.c) | 8 | ||||
| -rw-r--r-- | drivers/tty/bfin_jtag_comm.c (renamed from drivers/char/bfin_jtag_comm.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/cyclades.c (renamed from drivers/char/cyclades.c) | 6 | ||||
| -rw-r--r-- | drivers/tty/hvc/Kconfig | 105 | ||||
| -rw-r--r-- | drivers/tty/hvc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_bfin_jtag.c | 105 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvc_dcc.c | 43 | ||||
| -rw-r--r-- | drivers/tty/hvc/hvsi.c | 6 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/Makefile (renamed from drivers/char/pcmcia/ipwireless/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/hardware.c (renamed from drivers/char/pcmcia/ipwireless/hardware.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/hardware.h (renamed from drivers/char/pcmcia/ipwireless/hardware.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/main.c (renamed from drivers/char/pcmcia/ipwireless/main.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/main.h (renamed from drivers/char/pcmcia/ipwireless/main.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/network.c (renamed from drivers/char/pcmcia/ipwireless/network.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/network.h (renamed from drivers/char/pcmcia/ipwireless/network.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/setup_protocol.h (renamed from drivers/char/pcmcia/ipwireless/setup_protocol.h) | 0 | ||||
| -rw-r--r-- |