diff --git a/[refs] b/[refs] index 284b32525e76..2de46280b722 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d36e74c4392b5f26a5c4d94d7881a156ddc8e593 +refs/heads/master: d7ce20b2024d318b9ba88859226af1441270d99f diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index fa48dba5ba5e..6f4d856df987 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -1119,19 +1119,6 @@ int tty_hung_up_p(struct file *filp) EXPORT_SYMBOL(tty_hung_up_p); -/** - * is_tty - checker whether file is a TTY - * @filp: file handle that may be a tty - * - * Check if the file handle is a tty handle. - */ - -int is_tty(struct file *filp) -{ - return filp->f_op->read == tty_read - || filp->f_op->read == hung_up_tty_read; -} - static void session_clear_tty(struct pid *session) { struct task_struct *p;