Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / video / console / dummycon.c

diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index 7c8eeeb30a479eb55b7291a38fe16ceede8f9b6d..b63860f7beabba5be1f2a23d30225c4d72b24a1e 100644 (file)
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -9,6 +9,7 @@
 #include <linux/kdev_t.h>
 #include <linux/console.h>
 #include <linux/vt_kern.h>
+#include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
@@ -17,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