diff --git a/[refs] b/[refs] index 4a7669e0be36..f1c8b8da7c1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5e04b760a033c5247478dbc957970cd9d968fc6 +refs/heads/master: 2520e2745cf35c8fd01476dd01eacfc813649f7a diff --git a/trunk/drivers/tty/tty_io.c b/trunk/drivers/tty/tty_io.c index 739ea86c1cf1..da9fde850754 100644 --- a/trunk/drivers/tty/tty_io.c +++ b/trunk/drivers/tty/tty_io.c @@ -236,7 +236,7 @@ void tty_free_file(struct file *file) } /* Delete file from its tty */ -void tty_del_file(struct file *file) +static void tty_del_file(struct file *file) { struct tty_file_private *priv = file->private_data; @@ -554,7 +554,7 @@ EXPORT_SYMBOL_GPL(tty_wakeup); * tasklist_lock to walk task list for hangup event * ->siglock to protect ->signal/->sighand */ -void __tty_hangup(struct tty_struct *tty) +static void __tty_hangup(struct tty_struct *tty) { struct file *cons_filp = NULL; struct file *filp, *f = NULL;