VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 5e4fdc0..b30ae70 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -52,7 +52,7 @@ static int xcurs_correction = 29;
 static int newport_xsize;
 static int newport_ysize;
 
-static int newport_set_def_font(int unit, struct console_font_op *op);
+static int newport_set_def_font(int unit, struct console_font *op);
 
 #define BMASK(c) (c << 24)
 
@@ -477,7 +477,7 @@ static int newport_blank(struct vc_data *c, int blank)
        return 1;
 }
 
-static int newport_set_font(int unit, struct console_font_op *op)
+static int newport_set_font(int unit, struct console_font *op)
 {
        int w = op->width;
        int h = op->height;
@@ -531,7 +531,7 @@ static int newport_set_font(int unit, struct console_font_op *op)
        return 0;
 }
 
-static int newport_set_def_font(int unit, struct console_font_op *op)
+static int newport_set_def_font(int unit, struct console_font *op)
 {
        if (font_data[unit] != FONT_DATA) {
                if (--REFCOUNT(font_data[unit]) == 0)
@@ -543,18 +543,14 @@ static int newport_set_def_font(int unit, struct console_font_op *op)
        return 0;
 }
 
-static int newport_font_op(struct vc_data *vc, struct console_font_op *op)
+static int newport_font_default(struct vc_data *vc, struct console_font *op, char *name)
 {
-       int unit = vc->vc_num;
-
-       switch (op->op) {
-       case KD_FONT_OP_SET:
-               return newport_set_font(unit, op);
-       case KD_FONT_OP_SET_DEFAULT:
-               return newport_set_def_font(unit, op);
-       default:
-               return -ENOSYS;
-       }
+       return newport_set_def_font(vc->vc_num, op);
+}
+
+static int newport_font_set(struct vc_data *vc, struct console_font *font, unsigned flags)
+{
+       return newport_set_font(vc->vc_num, font);
 }
 
 static int newport_set_palette(struct vc_data *vc, unsigned char *table)
@@ -717,7 +713,8 @@ const struct consw newport_con = {
     .con_bmove =       newport_bmove,
     .con_switch =      newport_switch,
     .con_blank =       newport_blank,
-    .con_font_op =     newport_font_op,
+    .con_font_set =    newport_font_set,
+    .con_font_default =        newport_font_default,
     .con_set_palette = newport_set_palette,
     .con_scrolldelta = newport_scrolldelta,
     .con_set_origin =  DUMMY,