summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/funsoft.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-01-31 11:24:00 -0600
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-01-31 11:24:00 -0600
commit30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch)
treeeb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/usb/serial/funsoft.c
parent03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff)
parentf56df2f4db6e4af87fb8e941cff69f4501a111df (diff)
downloadtalos-op-linux-30716e07ef511ec7525c07eb1e8060ba8943c2a2.tar.gz
talos-op-linux-30716e07ef511ec7525c07eb1e8060ba8943c2a2.zip
Merge branch 'linus'
Diffstat (limited to 'drivers/usb/serial/funsoft.c')
-rw-r--r--drivers/usb/serial/funsoft.c2
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);
static int funsoft_ioctl(struct usb_serial_port *port, struct file *file,
unsigned int cmd, unsigned long arg)
{
- struct termios t;
+ struct ktermios t;
dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd);
OpenPOWER on IntegriCloud