Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer…

…' into tracing/core
mariux64 · Nov 26, 2008 · 509dcee · 509dcee
2 parents 1e9b51c + 14bfc98
commit 509dcee
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);