diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-15 03:17:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-15 03:17:33 -0400 |
| commit | 12b8aeee3e51654fb95a3baff2e093f2513bb87d (patch) | |
| tree | 73f78d62591b197cd53747e36a2f3d707b79a50b /include/linux/tty.h | |
| parent | 25268498c9e07870323aead10751b7c6e99a3a78 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'linus' into timers/core
Conflicts:
Documentation/feature-removal-schedule.txt
Merge reason: Resolve the conflict, update to upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index d96e5882f129..568369a86306 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -514,6 +514,7 @@ extern void tty_ldisc_enable(struct tty_struct *tty); | |||
| 514 | 514 | ||
| 515 | /* n_tty.c */ | 515 | /* n_tty.c */ |
| 516 | extern struct tty_ldisc_ops tty_ldisc_N_TTY; | 516 | extern struct tty_ldisc_ops tty_ldisc_N_TTY; |
| 517 | extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops); | ||
| 517 | 518 | ||
| 518 | /* tty_audit.c */ | 519 | /* tty_audit.c */ |
| 519 | #ifdef CONFIG_AUDIT | 520 | #ifdef CONFIG_AUDIT |