diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/linux/usb/serial.h | |
parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
parent | a8b3485287731978899ced11f24628c927890e78 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/usb/serial.h')
-rw-r--r-- | include/linux/usb/serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 91b3ea2bbb14..10f99e5f1a97 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h | |||
@@ -218,7 +218,7 @@ struct usb_serial_driver { | |||
218 | int (*write) (struct usb_serial_port *port, const unsigned char *buf, int count); | 218 | int (*write) (struct usb_serial_port *port, const unsigned char *buf, int count); |
219 | int (*write_room) (struct usb_serial_port *port); | 219 | int (*write_room) (struct usb_serial_port *port); |
220 | int (*ioctl) (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); | 220 | int (*ioctl) (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); |
221 | void (*set_termios) (struct usb_serial_port *port, struct termios * old); | 221 | void (*set_termios) (struct usb_serial_port *port, struct ktermios * old); |
222 | void (*break_ctl) (struct usb_serial_port *port, int break_state); | 222 | void (*break_ctl) (struct usb_serial_port *port, int break_state); |
223 | int (*chars_in_buffer) (struct usb_serial_port *port); | 223 | int (*chars_in_buffer) (struct usb_serial_port *port); |
224 | void (*throttle) (struct usb_serial_port *port); | 224 | void (*throttle) (struct usb_serial_port *port); |