diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 2 | ||||
-rw-r--r-- | net/irda/ircomm/ircomm_tty_ioctl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 8e78e7447726..b1805ff95415 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
@@ -830,7 +830,7 @@ static int rfcomm_tty_write_room(struct tty_struct *tty) | |||
830 | return room; | 830 | return room; |
831 | } | 831 | } |
832 | 832 | ||
833 | static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) | 833 | static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) |
834 | { | 834 | { |
835 | BT_DBG("tty %p cmd 0x%02x", tty, cmd); | 835 | BT_DBG("tty %p cmd 0x%02x", tty, cmd); |
836 | 836 | ||
diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c index 5e0e718c930a..77c5e6499f8f 100644 --- a/net/irda/ircomm/ircomm_tty_ioctl.c +++ b/net/irda/ircomm/ircomm_tty_ioctl.c | |||
@@ -365,12 +365,12 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self, | |||
365 | } | 365 | } |
366 | 366 | ||
367 | /* | 367 | /* |
368 | * Function ircomm_tty_ioctl (tty, file, cmd, arg) | 368 | * Function ircomm_tty_ioctl (tty, cmd, arg) |
369 | * | 369 | * |
370 | * | 370 | * |
371 | * | 371 | * |
372 | */ | 372 | */ |
373 | int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, | 373 | int ircomm_tty_ioctl(struct tty_struct *tty, |
374 | unsigned int cmd, unsigned long arg) | 374 | unsigned int cmd, unsigned long arg) |
375 | { | 375 | { |
376 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; | 376 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; |