aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/vt.c8
-rw-r--r--include/linux/console.h3
-rw-r--r--include/linux/consolemap.h1
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index a398b6b6aa65..8e4413f6fbaf 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -139,14 +139,6 @@ const struct consw *conswitchp;
139extern void vcs_make_sysfs(struct tty_struct *tty); 139extern void vcs_make_sysfs(struct tty_struct *tty);
140extern void vcs_remove_sysfs(struct tty_struct *tty); 140extern void vcs_remove_sysfs(struct tty_struct *tty);
141 141
142extern void console_map_init(void);
143#ifdef CONFIG_PROM_CONSOLE
144extern void prom_con_init(void);
145#endif
146#ifdef CONFIG_MDA_CONSOLE
147extern int mda_console_init(void);
148#endif
149
150struct vc vc_cons [MAX_NR_CONSOLES]; 142struct vc vc_cons [MAX_NR_CONSOLES];
151 143
152#ifndef VT_SINGLE_DRIVER 144#ifndef VT_SINGLE_DRIVER
diff --git a/include/linux/console.h b/include/linux/console.h
index 76a1807726eb..7d0420274de0 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -129,6 +129,9 @@ static inline void suspend_console(void) {}
129static inline void resume_console(void) {} 129static inline void resume_console(void) {}
130#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */ 130#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
131 131
132int mda_console_init(void);
133void prom_con_init(void);
134
132/* Some debug stub to catch some of the obvious races in the VT code */ 135/* Some debug stub to catch some of the obvious races in the VT code */
133#if 1 136#if 1
134#define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress) 137#define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress)
diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h
index 65842efc1b70..82c9a1f11020 100644
--- a/include/linux/consolemap.h
+++ b/include/linux/consolemap.h
@@ -13,3 +13,4 @@ struct vc_data;
13extern unsigned char inverse_translate(struct vc_data *conp, int glyph); 13extern unsigned char inverse_translate(struct vc_data *conp, int glyph);
14extern unsigned short *set_translate(int m, struct vc_data *vc); 14extern unsigned short *set_translate(int m, struct vc_data *vc);
15extern int conv_uni_to_pc(struct vc_data *conp, long ucs); 15extern int conv_uni_to_pc(struct vc_data *conp, long ucs);
16void console_map_init(void);