aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-26 01:58:05 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-26 01:58:05 +0100
commit509dceef6470442d8c7b8a43ec34125205840b3c (patch)
treeb02f0a55bf98aa5e7d44698cc80e23a01a41edef /include/linux
parent1e9b51c28312f7334394aa30be56ff52c2b65b7e (diff)
parent14bfc987e395797dfe03e915e8b4c7fc9e5078e4 (diff)
Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing/core
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/tty.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 3b8121d4e36..eaec37c9d83 100644
--- 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);