diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 13:22:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 13:22:26 +0100 |
| commit | 92fd4d4d67b945c0766416284d4ab236b31542c4 (patch) | |
| tree | 00b8b5f90748f752ccaba3dddbe271091d93543a /include/linux/usb/serial.h | |
| parent | fe7de49f9d4e53f24ec9ef762a503f70b562341c (diff) | |
| parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 (diff) | |
| download | talos-obmc-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.tar.gz talos-obmc-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.zip | |
Merge commit 'v2.6.37-rc2' into sched/core
Merge reason: Move to a .37-rc base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/usb/serial.h')
| -rw-r--r-- | include/linux/usb/serial.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 55675b1efb28..16d682f4f7c3 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -271,6 +271,8 @@ struct usb_serial_driver { int (*tiocmget)(struct tty_struct *tty, struct file *file); int (*tiocmset)(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear); + int (*get_icount)(struct tty_struct *tty, + struct serial_icounter_struct *icount); /* Called by the tty layer for port level work. There may or may not be an attached tty at this point */ void (*dtr_rts)(struct usb_serial_port *port, int on); |
