diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/usb/serial/funsoft.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
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 | ||