diff options
| author | James Morris <jmorris@namei.org> | 2009-09-30 07:47:33 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-30 07:47:33 +1000 |
| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/usb/serial/garmin_gps.c | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/usb/serial/garmin_gps.c')
| -rw-r--r-- | drivers/usb/serial/garmin_gps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 8839f1c70b7..20432d34552 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c @@ -933,8 +933,7 @@ static int garmin_init_session(struct usb_serial_port *port) -static int garmin_open(struct tty_struct *tty, - struct usb_serial_port *port, struct file *filp) +static int garmin_open(struct tty_struct *tty, struct usb_serial_port *port) { unsigned long flags; int status = 0; |