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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
video
/
console
/
sticon.c
diff --git
a/drivers/video/console/sticon.c
b/drivers/video/console/sticon.c
index
fd5940f
..
45586aa
100644
(file)
--- a/
drivers/video/console/sticon.c
+++ b/
drivers/video/console/sticon.c
@@
-37,7
+37,6
@@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/tty.h>
#include <linux/console.h>
#include <linux/errno.h>
#include <linux/vt_kern.h>
#include <linux/console.h>
#include <linux/errno.h>
#include <linux/vt_kern.h>
@@
-75,7
+74,7
@@
static inline void cursor_undrawn(void)
cursor_drawn = 0;
}
cursor_drawn = 0;
}
-static const char *
__init
sticon_startup(void)
+static const char *sticon_startup(void)
{
return "STI console";
}
{
return "STI console";
}