Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3cb340ecbb010013229ac56f26707252ebed09b8

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent 48afdf6eb7
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[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>

Showing 3 changed files with 4 additions and 8 deletions Side-by-side Diff

... ... @@ -139,14 +139,6 @@
139 139 extern void vcs_make_sysfs(struct tty_struct *tty);
140 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 142 struct vc vc_cons [MAX_NR_CONSOLES];
151 143  
152 144 #ifndef VT_SINGLE_DRIVER
include/linux/console.h
Diff comments   View file @ 3cb340e
... ... @@ -129,6 +129,9 @@
129 129 static inline void resume_console(void) {}
130 130 #endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
131 131  
  132 +int mda_console_init(void);
  133 +void prom_con_init(void);
  134 +
132 135 /* Some debug stub to catch some of the obvious races in the VT code */
133 136 #if 1
134 137 #define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress)
include/linux/consolemap.h
Diff comments   View file @ 3cb340e
... ... @@ -13,4 +13,5 @@
13 13 extern unsigned char inverse_translate(struct vc_data *conp, int glyph);
14 14 extern unsigned short *set_translate(int m, struct vc_data *vc);
15 15 extern int conv_uni_to_pc(struct vc_data *conp, long ucs);
  16 +void console_map_init(void);