From 53e86317e967b9a1b1b78d6a076547144454bce1 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 13 Oct 2008 10:44:33 +0100 Subject: 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 Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- drivers/isdn/capi/capi.c | 2 +- drivers/isdn/gigaset/ser-gigaset.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/isdn') diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 871b0cbca5e..798d7f3e42e 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, int error = 0; switch (cmd) { default: - error = n_tty_ioctl (tty, file, cmd, arg); + error = n_tty_ioctl_helper(tty, file, cmd, arg); break; } return error; diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index 5e89fa17781..cc4f4e44ffe 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: -- cgit v1.2.3