[PATCH 5/5] vt: proper prototypes for some console functions
DORMANTno replies
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: 2006-08-21 10:54:42
Subsystem:
char and misc drivers, console subsystem, the rest · Maintainers:
Arnd Bergmann, Greg Kroah-Hartman, Linus Torvalds
From: Adrian Bunk <redacted> This patch adds proper prototypes to header files for three console init functions used on drivers/char/vt.c Signed-off-by: Adrian Bunk <redacted> Signed-off-by: Antonino Daplas <redacted> --- drivers/char/vt.c | 8 -------- include/linux/console.h | 3 +++ include/linux/consolemap.h | 1 + 3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index e122d16..0037682 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c@@ -139,14 +139,6 @@ #define DEFAULT_BELL_DURATION (HZ/8) 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/include/linux/console.h b/include/linux/console.h
index 76a1807..7d04202 100644
--- a/include/linux/console.h
+++ b/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/include/linux/consolemap.h b/include/linux/consolemap.h
index 65842ef..82c9a1f 100644
--- a/include/linux/consolemap.h
+++ b/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); -------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642