diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-13 05:44:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 12:51:44 -0400 |
commit | 53e86317e967b9a1b1b78d6a076547144454bce1 (patch) | |
tree | 87f38a002bc278769aa632d3a6eadddee1e44732 /drivers/isdn/capi/capi.c | |
parent | 47afa7a5a8a8fb9e60cdb6a3bd612e07c37e9d90 (diff) |
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/capi/capi.c')
-rw-r--r-- | drivers/isdn/capi/capi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 871b0cbca5e4..798d7f3e42ef 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c | |||
@@ -1231,7 +1231,7 @@ static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file, | |||
1231 | int error = 0; | 1231 | int error = 0; |
1232 | switch (cmd) { | 1232 | switch (cmd) { |
1233 | default: | 1233 | default: |
1234 | error = n_tty_ioctl (tty, file, cmd, arg); | 1234 | error = n_tty_ioctl_helper(tty, file, cmd, arg); |
1235 | break; | 1235 | break; |
1236 | } | 1236 | } |
1237 | return error; | 1237 | return error; |