diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-13 11:44:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 18:51:44 +0200 |
| commit | 53e86317e967b9a1b1b78d6a076547144454bce1 (patch) | |
| tree | 87f38a002bc278769aa632d3a6eadddee1e44732 /drivers/isdn/gigaset | |
| parent | tty: some ICANON magic is in the wrong places (diff) | |
| download | linux-53e86317e967b9a1b1b78d6a076547144454bce1.tar.xz linux-53e86317e967b9a1b1b78d6a076547144454bce1.zip | |
tty: Fallout from tty-move-canon-specials
Today's linux-next build (x86_64 allmodconfig) failed like this:
/drivers/char/tty_ioctl.c: In function 'change_termios':
drivers/isdn/capi/capi.c:1234: error: implicit declaration of function 'n_tty_ioctl'
drivers/isdn/gigaset/ser-gigaset.c: In function 'gigaset_tty_ioctl':
drivers/isdn/gigaset/ser-gigaset.c:648: error: implicit declaration of function 'n_tty_ioctl'
Introduced by commit 686b5e4aea05a80e370dc931b7f4a8d03c80da54
("tty-move-canon-specials"). I added the following patch (which may not
be correct).
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/isdn/gigaset')
| -rw-r--r-- | drivers/isdn/gigaset/ser-gigaset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index 5e89fa177816..cc4f4e44ffe4 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c @@ -645,7 +645,7 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file, case TCGETS: case TCGETA: /* pass through to underlying serial device */ - rc = n_tty_ioctl(tty, file, cmd, arg); + rc = n_tty_ioctl_helper(tty, file, cmd, arg); break; case TCFLSH: @@ -660,7 +660,7 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file, break; } /* flush the serial port's buffer */ - rc = n_tty_ioctl(tty, file, cmd, arg); + rc = n_tty_ioctl_helper(tty, file, cmd, arg); break; case FIONREAD: |