Merge branch 'linus' into cpus4096

[linux-2.6-omap-h63xx.git] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 3b8121d4e36ff90aff5c8f7fa9fe3865be0baacc..eaec37c9d83d0a8dbbb87f7f46f1e0557ce00394 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -325,7 +325,7 @@ extern struct class *tty_class;
  *     go away
  */
 
-extern inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
+static inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
 {
        if (tty)
                kref_get(&tty->kref);