aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/funsoft.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-02-07 14:05:13 +1100
committerPaul Mackerras <paulus@samba.org>2007-02-07 14:05:13 +1100
commit8423200553113cc031caa9b147f6150a8e26545c (patch)
tree752c93a200c9ba056c7469c96f7e27d02c99291d /drivers/usb/serial/funsoft.c
parentf03e64f2ca6ee3d0b7824536b1940497701fe766 (diff)
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff)
downloadkernel_samsung_smdk4412-8423200553113cc031caa9b147f6150a8e26545c.tar.gz
kernel_samsung_smdk4412-8423200553113cc031caa9b147f6150a8e26545c.tar.bz2
kernel_samsung_smdk4412-8423200553113cc031caa9b147f6150a8e26545c.zip
Merge branch 'linux-2.6'
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 31501c9361b..2bebd63d5ed 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);