diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-25 19:58:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-25 19:58:05 -0500 |
| commit | 509dceef6470442d8c7b8a43ec34125205840b3c (patch) | |
| tree | b02f0a55bf98aa5e7d44698cc80e23a01a41edef | |
| parent | 1e9b51c28312f7334394aa30be56ff52c2b65b7e (diff) | |
| parent | 14bfc987e395797dfe03e915e8b4c7fc9e5078e4 (diff) | |
Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing/core
| -rw-r--r-- | include/linux/tty.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 3b8121d4e36f..eaec37c9d83d 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -325,7 +325,7 @@ extern struct class *tty_class; | |||
| 325 | * go away | 325 | * go away |
| 326 | */ | 326 | */ |
| 327 | 327 | ||
| 328 | extern inline struct tty_struct *tty_kref_get(struct tty_struct *tty) | 328 | static inline struct tty_struct *tty_kref_get(struct tty_struct *tty) |
| 329 | { | 329 | { |
| 330 | if (tty) | 330 | if (tty) |
| 331 | kref_get(&tty->kref); | 331 | kref_get(&tty->kref); |