vserver 2.0 rc7

[linux-2.6.git] / drivers / video / console / mdacon.c

diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index be3d535..989e4d4 100644 (file)
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -351,10 +351,9 @@ static void mdacon_init(struct vc_data *c, int init)
        if (init) {
                c->vc_cols = mda_num_columns;
                c->vc_rows = mda_num_lines;
-       } else {
-               vc_resize(c->vc_num, mda_num_columns, mda_num_lines);
-        }
-       
+       } else
+               vc_resize(c, mda_num_columns, mda_num_lines);
+
        /* make the first MDA console visible */
 
        if (mda_display_fg == NULL)
@@ -565,7 +564,7 @@ static int mdacon_scroll(struct vc_data *c, int t, int b, int dir, int lines)
  *  The console `switch' structure for the MDA based console
  */
 
-const struct consw mda_con = {
+static const struct consw mda_con = {
        .owner =                THIS_MODULE,
        .con_startup =          mdacon_startup,
        .con_init =             mdacon_init,
@@ -592,7 +591,7 @@ int __init mda_console_init(void)
        return take_over_console(&mda_con, mda_first_vc-1, mda_last_vc-1, 0);
 }
 
-void __exit mda_console_exit(void)
+static void __exit mda_console_exit(void)
 {
        give_up_console(&mda_con);
 }