git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
video
/
console
/
promcon.c
diff --git
a/drivers/video/console/promcon.c
b/drivers/video/console/promcon.c
index
b78eac6
..
04f42fc
100644
(file)
--- a/
drivers/video/console/promcon.c
+++ b/
drivers/video/console/promcon.c
@@
-5,11
+5,13
@@
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
*/
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
+#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/console.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/console.h>
@@
-107,7
+109,7
@@
promcon_end(struct vc_data *conp, char *b)
return b - p;
}
return b - p;
}
-const char *promcon_startup(void)
+const char
__init
*promcon_startup(void)
{
const char *display_desc = "PROM";
int node;
{
const char *display_desc = "PROM";
int node;
@@
-131,7
+133,7
@@
const char *promcon_startup(void)
return display_desc;
}
return display_desc;
}
-static void
+static void
__init
promcon_init_unimap(struct vc_data *conp)
{
mm_segment_t old_fs = get_fs();
promcon_init_unimap(struct vc_data *conp)
{
mm_segment_t old_fs = get_fs();