Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3b8c61c9
Commit
3b8c61c9
authored
Mar 06, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix "con_init()" function type and stale (and incorrect) declaration
parent
717da745
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
drivers/char/vt.c
drivers/char/vt.c
+3
-2
include/linux/tty.h
include/linux/tty.h
+0
-1
No files found.
drivers/char/vt.c
View file @
3b8c61c9
...
@@ -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
);
...
...
include/linux/tty.h
View file @
3b8c61c9
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment