serial-make-uart_ports-ioport-unsigned-long-fix

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

diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index 878707a0439824488cbdd7ae5d81b214e6dd2129..b63860f7beabba5be1f2a23d30225c4d72b24a1e 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>
 
@@ -18,8 +18,8 @@
  */
 
 #if defined(__arm__)
-#define DUMMY_COLUMNS  ORIG_VIDEO_COLS
-#define DUMMY_ROWS     ORIG_VIDEO_LINES
+#define DUMMY_COLUMNS  screen_info.orig_video_cols
+#define DUMMY_ROWS     screen_info.orig_video_lines
 #elif defined(__hppa__)
 /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */
 #define DUMMY_COLUMNS  CONFIG_DUMMY_CONSOLE_COLUMNS