diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-10-03 01:15:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:04:12 -0700 |
| commit | 3cb340ecbb010013229ac56f26707252ebed09b8 (patch) | |
| tree | 9b1fa6c968c01b84116b596517e9580ec64e2c9d | |
| parent | 48afdf6eb750b6836932e4d492b90448bc68dfc0 (diff) | |
| download | op-kernel-dev-3cb340ecbb010013229ac56f26707252ebed09b8.zip op-kernel-dev-3cb340ecbb010013229ac56f26707252ebed09b8.tar.gz | |
[PATCH] vt: proper prototypes for some console functions
This patch adds proper prototypes to header files for three console init
functions used on drivers/char/vt.c
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/char/vt.c | 8 | ||||
| -rw-r--r-- | include/linux/console.h | 3 | ||||
| -rw-r--r-- | 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 a398b6b..8e4413f 100644 --- a/drivers/char/vt.c +++ b/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/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); |
