Commit 3b8c61c9 authored by Linus Torvalds's avatar Linus Torvalds

Fix "con_init()" function type and stale (and incorrect) declaration

parent 717da745
...@@ -2443,7 +2443,7 @@ static void vc_init(unsigned int currcons, unsigned int rows, unsigned int cols, ...@@ -2443,7 +2443,7 @@ static void vc_init(unsigned int currcons, unsigned int rows, unsigned int cols,
struct tty_driver console_driver; struct tty_driver console_driver;
static int console_refcount; static int console_refcount;
static void __init con_init(void) static int __init con_init(void)
{ {
const char *display_desc = NULL; const char *display_desc = NULL;
unsigned int currcons = 0; unsigned int currcons = 0;
...@@ -2452,7 +2452,7 @@ static void __init con_init(void) ...@@ -2452,7 +2452,7 @@ static void __init con_init(void)
display_desc = conswitchp->con_startup(); display_desc = conswitchp->con_startup();
if (!display_desc) { if (!display_desc) {
fg_console = 0; fg_console = 0;
return; return 0;
} }
init_timer(&console_timer); init_timer(&console_timer);
...@@ -2491,6 +2491,7 @@ static void __init con_init(void) ...@@ -2491,6 +2491,7 @@ static void __init con_init(void)
#ifdef CONFIG_VT_CONSOLE #ifdef CONFIG_VT_CONSOLE
register_console(&vt_console_driver); register_console(&vt_console_driver);
#endif #endif
return 0;
} }
console_initcall(con_init); console_initcall(con_init);
......
...@@ -348,7 +348,6 @@ extern int fg_console, last_console, want_console; ...@@ -348,7 +348,6 @@ extern int fg_console, last_console, want_console;
extern int kmsg_redirect; extern int kmsg_redirect;
extern void con_init(void);
extern void console_init(void); extern void console_init(void);
extern int lp_init(void); extern int lp_init(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment