diff --git a/[refs] b/[refs]
index be2d5e97b5ea..ebe1b833c048 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b0c4bed77041bf64e26b502cd2a767e355c3342
+refs/heads/master: d769a66970a947613f7c638c362f237583bd141b
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index 06e5a3f1836d..26e5e19ed854 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -185,7 +185,7 @@ char *tty_name(struct tty_struct *tty, char *buf)
 
 EXPORT_SYMBOL(tty_name);
 
-inline int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
+int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
 			      const char *routine)
 {
 #ifdef TTY_PARANOIA_CHECK