---

yaml --- r: 38074 b: refs/heads/master c: 3cb340e h: refs/heads/master v: v3
git-mirror · Oct 3, 2006 · e8e1936 · e8e1936
1 parent d1c36d4
commit e8e1936
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48afdf6eb750b6836932e4d492b90448bc68dfc0
+refs/heads/master: 3cb340ecbb010013229ac56f26707252ebed09b8
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
@@ -139,14 +139,6 @@ const struct consw *conswitchp;
 extern void vcs_make_sysfs(struct tty_struct *tty);
 extern void vcs_remove_sysfs(struct tty_struct *tty);
 
-extern void console_map_init(void);
-#ifdef CONFIG_PROM_CONSOLE
-extern void prom_con_init(void);
-#endif
-#ifdef CONFIG_MDA_CONSOLE
-extern int mda_console_init(void);
-#endif
-
 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
@@ -129,6 +129,9 @@ static inline void suspend_console(void) {}
 static inline void resume_console(void) {}
 #endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
 
+int mda_console_init(void);
+void prom_con_init(void);
+
 /* 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)

diff --git a/trunk/include/linux/consolemap.h b/trunk/include/linux/consolemap.h
@@ -13,3 +13,4 @@ struct vc_data;
 extern unsigned char inverse_translate(struct vc_data *conp, int glyph);
 extern unsigned short *set_translate(int m, struct vc_data *vc);
 extern int conv_uni_to_pc(struct vc_data *conp, long ucs);
+void console_map_init(void);