diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
| commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
| tree | 8b639000418e2756bf6baece4e00e07d2534bccc /include/net/irda/ircomm_tty.h | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/net/irda/ircomm_tty.h')
| -rw-r--r-- | include/net/irda/ircomm_tty.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h index eea2e6152389..59ba38bc400f 100644 --- a/include/net/irda/ircomm_tty.h +++ b/include/net/irda/ircomm_tty.h | |||
| @@ -120,10 +120,10 @@ struct ircomm_tty_cb { | |||
| 120 | void ircomm_tty_start(struct tty_struct *tty); | 120 | void ircomm_tty_start(struct tty_struct *tty); |
| 121 | void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self); | 121 | void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self); |
| 122 | 122 | ||
| 123 | extern int ircomm_tty_tiocmget(struct tty_struct *tty, struct file *file); | 123 | extern int ircomm_tty_tiocmget(struct tty_struct *tty); |
| 124 | extern int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file, | 124 | extern int ircomm_tty_tiocmset(struct tty_struct *tty, |
| 125 | unsigned int set, unsigned int clear); | 125 | unsigned int set, unsigned int clear); |
| 126 | extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, | 126 | extern int ircomm_tty_ioctl(struct tty_struct *tty, |
| 127 | unsigned int cmd, unsigned long arg); | 127 | unsigned int cmd, unsigned long arg); |
| 128 | extern void ircomm_tty_set_termios(struct tty_struct *tty, | 128 | extern void ircomm_tty_set_termios(struct tty_struct *tty, |
| 129 | struct ktermios *old_termios); | 129 | struct ktermios *old_termios); |