patch-2.1.111 linux/drivers/video/dummycon.c

• Lines: 35
• Date: Wed Jul 22 13:40:04 1998
• Orig file: v2.1.110/linux/drivers/video/dummycon.c
• Orig date: Thu Jul 16 18:09:27 1998

diff -u --recursive --new-file v2.1.110/linux/drivers/video/dummycon.c linux/drivers/video/dummycon.c
@@ -5,6 +5,7 @@
  *  available, usually until fbcon takes console over.
  */
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kdev_t.h>
 #include <linux/tty.h>
@@ -15,13 +16,15 @@
 
 /*
  *  Dummy console driver
- *
  */
 
 #ifdef __sparc__
 /* Some reasonable defaults, so that we don't loose any text */
 #define DUMMY_COLUMNS	128
 #define DUMMY_ROWS	54
+#elif defined(CONFIG_ARM)
+#define DUMMY_COLUMNS	ORIG_VIDEO_COLS
+#define DUMMY_ROWS	ORIG_VIDEO_LINES
 #else
 #define DUMMY_COLUMNS	80
 #define DUMMY_ROWS	25
@@ -64,8 +67,7 @@
     (void *)dummycon_dummy,	/* con_bmove */
     (void *)dummycon_dummy,	/* con_switch */
     (void *)dummycon_dummy,	/* con_blank */
-    (void *)dummycon_dummy,	/* con_get_font */
-    (void *)dummycon_dummy,	/* con_set_font */
+    (void *)dummycon_dummy,	/* con_font_op */
     (void *)dummycon_dummy,	/* con_set_palette */
     (void *)dummycon_dummy,	/* con_scrolldelta */
     NULL,			/* con_set_origin */