diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-10-03 04:15:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:12 -0400 |
commit | 3cb340ecbb010013229ac56f26707252ebed09b8 (patch) | |
tree | 9b1fa6c968c01b84116b596517e9580ec64e2c9d | |
parent | 48afdf6eb750b6836932e4d492b90448bc68dfc0 (diff) |
[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 a398b6b6aa65..8e4413f6fbaf 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -139,14 +139,6 @@ const struct consw *conswitchp; | |||
139 | extern void vcs_make_sysfs(struct tty_struct *tty); | 139 | extern void vcs_make_sysfs(struct tty_struct *tty); |
140 | extern void vcs_remove_sysfs(struct tty_struct *tty); | 140 | extern void vcs_remove_sysfs(struct tty_struct *tty); |
141 | 141 | ||
142 | extern void console_map_init(void); | ||
143 | #ifdef CONFIG_PROM_CONSOLE | ||
144 | extern void prom_con_init(void); | ||
145 | #endif | ||
146 | #ifdef CONFIG_MDA_CONSOLE | ||
147 | extern int mda_console_init(void); | ||
148 | #endif | ||
149 | |||
150 | struct vc vc_cons [MAX_NR_CONSOLES]; | 142 | struct 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) {} | |||
129 | static inline void resume_console(void) {} | 129 | static inline void resume_console(void) {} |
130 | #endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */ | 130 | #endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */ |
131 | 131 | ||
132 | int mda_console_init(void); | ||
133 | void 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; | |||
13 | extern unsigned char inverse_translate(struct vc_data *conp, int glyph); | 13 | extern unsigned char inverse_translate(struct vc_data *conp, int glyph); |
14 | extern unsigned short *set_translate(int m, struct vc_data *vc); | 14 | extern unsigned short *set_translate(int m, struct vc_data *vc); |
15 | extern int conv_uni_to_pc(struct vc_data *conp, long ucs); | 15 | extern int conv_uni_to_pc(struct vc_data *conp, long ucs); |
16 | void console_map_init(void); | ||