From 3b8c61c924426167fc853fc81ad485e25465cc53 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 6 Mar 2003 05:27:20 -0800 Subject: [PATCH] Fix "con_init()" function type and stale (and incorrect) declaration --- drivers/char/vt.c | 5 +++-- include/linux/tty.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 1f0cc2c94cc46..15b26fd738e6f 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2443,7 +2443,7 @@ static void vc_init(unsigned int currcons, unsigned int rows, unsigned int cols, struct tty_driver console_driver; static int console_refcount; -static void __init con_init(void) +static int __init con_init(void) { const char *display_desc = NULL; unsigned int currcons = 0; @@ -2452,7 +2452,7 @@ static void __init con_init(void) display_desc = conswitchp->con_startup(); if (!display_desc) { fg_console = 0; - return; + return 0; } init_timer(&console_timer); @@ -2491,6 +2491,7 @@ static void __init con_init(void) #ifdef CONFIG_VT_CONSOLE register_console(&vt_console_driver); #endif + return 0; } console_initcall(con_init); diff --git a/include/linux/tty.h b/include/linux/tty.h index 06388e6183829..9c16b6c58bd0b 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -348,7 +348,6 @@ extern int fg_console, last_console, want_console; extern int kmsg_redirect; -extern void con_init(void); extern void console_init(void); extern int lp_init(void); -- 2.53.0