aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/tty.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index d9fb4b043f56..a93cce297832 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -371,6 +371,7 @@ extern void proc_clear_tty(struct task_struct *p);
371extern struct tty_struct *get_current_tty(void); 371extern struct tty_struct *get_current_tty(void);
372/* tty_io.c */ 372/* tty_io.c */
373extern int __init tty_init(void); 373extern int __init tty_init(void);
374extern const char *tty_name(const struct tty_struct *tty);
374#else 375#else
375static inline void console_init(void) 376static inline void console_init(void)
376{ } 377{ }
@@ -391,6 +392,8 @@ static inline struct tty_struct *get_current_tty(void)
391/* tty_io.c */ 392/* tty_io.c */
392static inline int __init tty_init(void) 393static inline int __init tty_init(void)
393{ return 0; } 394{ return 0; }
395static inline const char *tty_name(const struct tty_struct *tty)
396{ return "(none)"; }
394#endif 397#endif
395 398
396extern struct ktermios tty_std_termios; 399extern struct ktermios tty_std_termios;
@@ -415,7 +418,6 @@ static inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
415 return tty; 418 return tty;
416} 419}
417 420
418extern const char *tty_name(const struct tty_struct *tty);
419extern const char *tty_driver_name(const struct tty_struct *tty); 421extern const char *tty_driver_name(const struct tty_struct *tty);
420extern void tty_wait_until_sent(struct tty_struct *tty, long timeout); 422extern void tty_wait_until_sent(struct tty_struct *tty, long timeout);
421extern int __tty_check_change(struct tty_struct *tty, int sig); 423extern int __tty_check_change(struct tty_struct *tty, int sig);