diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-02-14 16:27:22 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 11:59:56 -0800 |
| commit | 6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch) | |
| tree | eb6e387e080a44680d6d8686999336e69ec97e71 /include/net/irda | |
| parent | 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (diff) | |
| download | linux-stable-6caa76b7786891b42b66a0e61e2c2fff2c884620.tar.gz linux-stable-6caa76b7786891b42b66a0e61e2c2fff2c884620.tar.bz2 linux-stable-6caa76b7786891b42b66a0e61e2c2fff2c884620.zip | |
tty: now phase out the ioctl file pointer for good
Only oddities here are a couple of drivers that bogusly called the ldisc
helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes
away.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/net/irda')
| -rw-r--r-- | include/net/irda/ircomm_tty.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h index 980ccb66e1b4..59ba38bc400f 100644 --- a/include/net/irda/ircomm_tty.h +++ b/include/net/irda/ircomm_tty.h @@ -123,7 +123,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self); extern int ircomm_tty_tiocmget(struct tty_struct *tty); extern int ircomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear); -extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, +extern int ircomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); extern void ircomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios); |