dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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🔢 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>
This commit is contained in:
Stephen Rothwell 2008-10-13 10:44:33 +01:00 committed by Linus Torvalds
parent 47afa7a5a8
commit 53e86317e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/isdn/capi/capi.c
View File

@ -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;

4
drivers/isdn/gigaset/ser-gigaset.c
View File

@ -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: