fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index cbe3386..d9315d9 100644 (file)
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -7,9 +7,9 @@
 
 #include <linux/types.h>
 #include <linux/kdev_t.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/vt_kern.h>
+#include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
@@ -22,7 +22,6 @@
 #define DUMMY_ROWS     ORIG_VIDEO_LINES
 #elif defined(__hppa__)
 /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */
-#include <linux/config.h>
 #define DUMMY_COLUMNS  CONFIG_DUMMY_CONSOLE_COLUMNS
 #define DUMMY_ROWS     CONFIG_DUMMY_CONSOLE_ROWS
 #else
@@ -42,7 +41,7 @@ static void dummycon_init(struct vc_data *vc, int init)
        vc->vc_cols = DUMMY_COLUMNS;
        vc->vc_rows = DUMMY_ROWS;
     } else
-       vc_resize(vc->vc_num, DUMMY_COLUMNS, DUMMY_ROWS);
+       vc_resize(vc, DUMMY_COLUMNS, DUMMY_ROWS);
 }
 
 static int dummycon_dummy(void)
@@ -71,7 +70,10 @@ const struct consw dummy_con = {
     .con_bmove =       DUMMY,
     .con_switch =      DUMMY,
     .con_blank =       DUMMY,
-    .con_font_op =     DUMMY,
+    .con_font_set =    DUMMY,
+    .con_font_get =    DUMMY,
+    .con_font_default =        DUMMY,
+    .con_font_copy =   DUMMY,
     .con_set_palette = DUMMY,
     .con_scrolldelta = DUMMY,
 };