fedora core 6 1.2949 + vserver 2.2.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 9d7816b..57b21e5 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/tty.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;
 }
 
-static const char *__init sticon_startup(void)
+static const char *sticon_startup(void)
 {
     return "STI console";
 }
@@ -85,20 +84,14 @@ static int sticon_set_palette(struct vc_data *c, unsigned char *table)
     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;
     int redraw_cursor = 0;
 
     if (vga_is_gfx || console_blanked)
            return;
-           
-    if (vt_cons[unit]->vc_mode != KD_TEXT)
+
+    if (conp->vc_mode != KD_TEXT)
            return;
 #if 0
     if ((p->cursor_x == xpos) && (p->cursor_y == ypos)) {
@@ -116,15 +109,14 @@ static void sticon_putc(struct vc_data *conp, int c, int ypos, int xpos)
 static void sticon_putcs(struct vc_data *conp, const unsigned short *s,
                         int count, int ypos, int xpos)
 {
-    int unit = conp->vc_num;
     int redraw_cursor = 0;
 
     if (vga_is_gfx || console_blanked)
            return;
 
-    if (vt_cons[unit]->vc_mode != KD_TEXT)
+    if (conp->vc_mode != KD_TEXT)
            return;
-    
+
 #if 0
     if ((p->cursor_y == ypos) && (xpos <= p->cursor_x) &&
        (p->cursor_x < (xpos + count))) {
@@ -222,7 +214,7 @@ static void sticon_init(struct vc_data *c, int init)
     } else {
        /* vc_rows = (c->vc_rows > vc_rows) ? vc_rows : c->vc_rows; */
        /* vc_cols = (c->vc_cols > vc_cols) ? vc_cols : c->vc_cols; */
-       vc_resize(c->vc_num, vc_cols, vc_rows); 
+       vc_resize(c, vc_cols, vc_rows);
 /*     vc_resize_con(vc_rows, vc_cols, c->vc_num); */
     }
 }
@@ -353,7 +345,8 @@ static void sticon_save_screen(struct vc_data *conp)
 {
 }
 
-static struct consw sti_con = {
+static const struct consw sti_con = {
+       .owner                  = THIS_MODULE,
        .con_startup            = sticon_startup,
        .con_init               = sticon_init,
        .con_deinit             = sticon_deinit,
@@ -365,7 +358,6 @@ static struct consw sti_con = {
        .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,
@@ -390,7 +382,7 @@ int __init sticonsole_init(void)
 
     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;
 }