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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
video
/
console
/
sticon.c
diff --git
a/drivers/video/console/sticon.c
b/drivers/video/console/sticon.c
index
9d7816b
..
9926268
100644
(file)
--- a/
drivers/video/console/sticon.c
+++ b/
drivers/video/console/sticon.c
@@
-85,11
+85,6
@@
static int sticon_set_palette(struct vc_data *c, unsigned char *table)
return -EINVAL;
}
return -EINVAL;
}
-static int sticon_font_op(struct vc_data *c, struct console_font_op *op)
-{
- return -ENOSYS;
-}
-
static void sticon_putc(struct vc_data *conp, int c, int ypos, int xpos)
{
int unit = conp->vc_num;
static void sticon_putc(struct vc_data *conp, int c, int ypos, int xpos)
{
int unit = conp->vc_num;
@@
-354,6
+349,7
@@
static void sticon_save_screen(struct vc_data *conp)
}
static struct consw sti_con = {
}
static struct consw sti_con = {
+ .owner = THIS_MODULE,
.con_startup = sticon_startup,
.con_init = sticon_init,
.con_deinit = sticon_deinit,
.con_startup = sticon_startup,
.con_init = sticon_init,
.con_deinit = sticon_deinit,
@@
-365,7
+361,6
@@
static struct consw sti_con = {
.con_bmove = sticon_bmove,
.con_switch = sticon_switch,
.con_blank = sticon_blank,
.con_bmove = sticon_bmove,
.con_switch = sticon_switch,
.con_blank = sticon_blank,
- .con_font_op = sticon_font_op,
.con_set_palette = sticon_set_palette,
.con_scrolldelta = sticon_scrolldelta,
.con_set_origin = sticon_set_origin,
.con_set_palette = sticon_set_palette,
.con_scrolldelta = sticon_scrolldelta,
.con_set_origin = sticon_set_origin,
@@
-390,7
+385,7
@@
int __init sticonsole_init(void)
if (conswitchp == &dummy_con) {
printk(KERN_INFO "sticon: Initializing STI text console.\n");
if (conswitchp == &dummy_con) {
printk(KERN_INFO "sticon: Initializing STI text console.\n");
- take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1);
+
return
take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1);
}
return 0;
}
}
return 0;
}