diff --git a/[refs] b/[refs] index 3a17fcc0c5d9..d3ce3c46f783 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57a87bb0720a5cf7a9ece49a8c8ed288398fd1bb +refs/heads/master: 1b135431abf5ea92e61bf4e91d93726c7b96da5f diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c index 06c32a3e3ca4..13299b8fdbd6 100644 --- a/trunk/drivers/char/vt.c +++ b/trunk/drivers/char/vt.c @@ -136,9 +136,6 @@ const struct consw *conswitchp; #define DEFAULT_BELL_PITCH 750 #define DEFAULT_BELL_DURATION (HZ/8) -extern void vcs_make_sysfs(struct tty_struct *tty); -extern void vcs_remove_sysfs(struct tty_struct *tty); - struct vc vc_cons [MAX_NR_CONSOLES]; #ifndef VT_SINGLE_DRIVER diff --git a/trunk/include/linux/console.h b/trunk/include/linux/console.h index 7d0420274de0..de25ee3b7919 100644 --- a/trunk/include/linux/console.h +++ b/trunk/include/linux/console.h @@ -21,6 +21,7 @@ struct vc_data; struct console_font_op; struct console_font; struct module; +struct tty_struct; /* * this is what the terminal answers to a ESC-Z or csi0c query. @@ -132,6 +133,9 @@ static inline void resume_console(void) {} int mda_console_init(void); void prom_con_init(void); +void vcs_make_sysfs(struct tty_struct *tty); +void vcs_remove_sysfs(struct tty_struct *tty); + /* Some debug stub to catch some of the obvious races in the VT code */ #if 1 #define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress)