diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:39:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:39:20 -0800 |
| commit | 56b85f32d530d09d6805488ad00775d4e0e3baab (patch) | |
| tree | e7fbe69e338ef775d3b2dd822aa915d259b4bc94 /include/linux/tty_driver.h | |
| parent | 3e5b08cbbf78bedd316904ab0cf3b27119433ee5 (diff) | |
| parent | 568389c257fa7d74ce36c2f78bad31965fded4cf (diff) | |
| download | kernel_samsung_smdk4412-56b85f32d530d09d6805488ad00775d4e0e3baab.zip kernel_samsung_smdk4412-56b85f32d530d09d6805488ad00775d4e0e3baab.tar.gz kernel_samsung_smdk4412-56b85f32d530d09d6805488ad00775d4e0e3baab.tar.bz2 | |
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: (36 commits)
serial: apbuart: Fixup apbuart_console_init()
TTY: Add tty ioctl to figure device node of the system console.
tty: add 'active' sysfs attribute to tty0 and console device
drivers: serial: apbuart: Handle OF failures gracefully
Serial: Avoid unbalanced IRQ wake disable during resume
tty: fix typos/errors in tty_driver.h comments
pch_uart : fix warnings for 64bit compile
8250: fix uninitialized FIFOs
ip2: fix compiler warning on ip2main_pci_tbl
specialix: fix compiler warning on specialix_pci_tbl
rocket: fix compiler warning on rocket_pci_ids
8250: add a UPIO_DWAPB32 for 32 bit accesses
8250: use container_of() instead of casting
serial: omap-serial: Add support for kernel debugger
serial: fix pch_uart kconfig & build
drivers: char: hvc: add arm JTAG DCC console support
RS485 documentation: add 16C950 UART description
serial: ifx6x60: fix memory leak
serial: ifx6x60: free IRQ on error
Serial: EG20T: add PCH_UART driver
...
Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
makes the code look fairly sane (unlike either side).
Diffstat (limited to 'include/linux/tty_driver.h')
| -rw-r--r-- | include/linux/tty_driver.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index db2d227..c3d43eb 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h @@ -102,7 +102,7 @@ * unsigned int cmd, unsigned long arg); * * This routine allows the tty driver to implement - * device-specific ioctl's. If the ioctl number passed in cmd + * device-specific ioctls. If the ioctl number passed in cmd * is not recognized by the driver, it should return ENOIOCTLCMD. * * Optional @@ -167,12 +167,12 @@ * * void (*hangup)(struct tty_struct *tty); * - * This routine notifies the tty driver that it should hangup the + * This routine notifies the tty driver that it should hang up the * tty device. * * Optional: * - * int (*break_ctl)(struct tty_stuct *tty, int state); + * int (*break_ctl)(struct tty_struct *tty, int state); * * This optional routine requests the tty driver to turn on or * off BREAK status on the RS-232 port. If state is -1, @@ -235,6 +235,7 @@ #include <linux/fs.h> #include <linux/list.h> #include <linux/cdev.h> +#include <linux/termios.h> struct tty_struct; struct tty_driver; @@ -357,7 +358,7 @@ static inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d) * overruns, either.) * * TTY_DRIVER_DYNAMIC_DEV --- if set, the individual tty devices need - * to be registered with a call to tty_register_driver() when the + * to be registered with a call to tty_register_device() when the * device is found in the system and unregistered with a call to * tty_unregister_device() so the devices will be show up * properly in sysfs. If not set, driver->num entries will be |