diff options
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/tty.c | 2 | ||||
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c index 7d2ef4909a73..748190dfbab0 100644 --- a/drivers/char/pcmcia/ipwireless/tty.c +++ b/drivers/char/pcmcia/ipwireless/tty.c | |||
@@ -410,7 +410,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty) | |||
410 | } | 410 | } |
411 | 411 | ||
412 | static int | 412 | static int |
413 | ipw_tiocmset(struct tty_struct *linux_tty, struct file *file, | 413 | ipw_tiocmset(struct tty_struct *linux_tty, |
414 | unsigned int set, unsigned int clear) | 414 | unsigned int set, unsigned int clear) |
415 | { | 415 | { |
416 | struct ipw_tty *tty = linux_tty->driver_data; | 416 | struct ipw_tty *tty = linux_tty->driver_data; |
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 7b68ba6609fe..02127cad0980 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -419,8 +419,8 @@ static void bh_status(MGSLPC_INFO *info); | |||
419 | * ioctl handlers | 419 | * ioctl handlers |
420 | */ | 420 | */ |
421 | static int tiocmget(struct tty_struct *tty); | 421 | static int tiocmget(struct tty_struct *tty); |
422 | static int tiocmset(struct tty_struct *tty, struct file *file, | 422 | static int tiocmset(struct tty_struct *tty, |
423 | unsigned int set, unsigned int clear); | 423 | unsigned int set, unsigned int clear); |
424 | static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount); | 424 | static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount); |
425 | static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params); | 425 | static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params); |
426 | static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty); | 426 | static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty); |
@@ -2139,7 +2139,7 @@ static int tiocmget(struct tty_struct *tty) | |||
2139 | 2139 | ||
2140 | /* set modem control signals (DTR/RTS) | 2140 | /* set modem control signals (DTR/RTS) |
2141 | */ | 2141 | */ |
2142 | static int tiocmset(struct tty_struct *tty, struct file *file, | 2142 | static int tiocmset(struct tty_struct *tty, |
2143 | unsigned int set, unsigned int clear) | 2143 | unsigned int set, unsigned int clear) |
2144 | { | 2144 | { |
2145 | MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; | 2145 | MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; |