diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
| commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
| tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/usb/serial/funsoft.c | |
| parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
| parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/serial/funsoft.c')
| -rw-r--r-- | drivers/usb/serial/funsoft.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index 31501c9361b9..2bebd63d5ed1 100644 --- a/drivers/usb/serial/funsoft.c +++ b/drivers/usb/serial/funsoft.c | |||
| @@ -27,7 +27,7 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
| 27 | static int funsoft_ioctl(struct usb_serial_port *port, struct file *file, | 27 | static int funsoft_ioctl(struct usb_serial_port *port, struct file *file, |
| 28 | unsigned int cmd, unsigned long arg) | 28 | unsigned int cmd, unsigned long arg) |
| 29 | { | 29 | { |
| 30 | struct termios t; | 30 | struct ktermios t; |
| 31 | 31 | ||
| 32 | dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd); | 32 | dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd); |
| 33 | 33 | ||