diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:04:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:04:10 +1000 |
| commit | cdcc164fdfa45cfbc6ceefd0db662cb8595d0273 (patch) | |
| tree | 5505922aea9863cbe8d6d573f4ad18a5d118a23f /drivers/usb/serial/ti_usb_3410_5052.c | |
| parent | 0ae00a3808e20a1479a4794b5c617a14bd477de3 (diff) | |
| parent | 9fd6651b708634b928622565334c51fa60ad8896 (diff) | |
Merge branch 'quilt/tty'
Conflicts:
arch/x86/include/asm/termios.h
Diffstat (limited to 'drivers/usb/serial/ti_usb_3410_5052.c')
| -rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 3bc609fe2242..1e9dc8821698 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -98,8 +98,7 @@ struct ti_device { static int ti_startup(struct usb_serial *serial); static void ti_release(struct usb_serial *serial); -static int ti_open(struct tty_struct *tty, struct usb_serial_port *port, - struct file *file); +static int ti_open(struct tty_struct *tty, struct usb_serial_port *port); static void ti_close(struct usb_serial_port *port); static int ti_write(struct tty_struct *tty, struct usb_serial_port *port, const unsigned char *data, int count); @@ -492,8 +491,7 @@ static void ti_release(struct usb_serial *serial) } -static int ti_open(struct tty_struct *tty, - struct usb_serial_port *port, struct file *file) +static int ti_open(struct tty_struct *tty, struct usb_serial_port *port) { struct ti_port *tport = usb_get_serial_port_data(port); struct ti_device *tdev; |