Merge pull request torvalds#112 from lkl/revert-109-fix-screeninfo

Revert "lkl: Fix missing screen_info during compilation."
laijs · Mar 1, 2016 · 6de4cd5 · 6de4cd5
2 parents e1505c9 + bdeb7c2
commit 6de4cd5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/arch/lkl/Kconfig b/arch/lkl/Kconfig
@@ -1,6 +1,6 @@
 config LKL
        def_bool y
-       depends on !SMP && !MMU && !COREDUMP && !AUDITSYSCALL && !SECCOMP && !TRACEPOINTS && !UPROBES && !COMPAT && !USER_RETURN_NOTIFIER && !VGA_CONSOLE
+       depends on !SMP && !MMU && !COREDUMP && !AUDITSYSCALL && !SECCOMP && !TRACEPOINTS && !UPROBES && !COMPAT && !USER_RETURN_NOTIFIER
        select ARCH_THREAD_INFO_ALLOCATOR
        select RWSEM_GENERIC_SPINLOCK
        select GENERIC_ATOMIC64

diff --git a/arch/lkl/kernel/setup.c b/arch/lkl/kernel/setup.c
@@ -1,6 +1,5 @@
 #include <linux/init.h>
 #include <linux/init_task.h>
-#include <linux/screen_info.h>
 #include <linux/reboot.h>
 #include <linux/fs.h>
 #include <linux/start_kernel.h>
@@ -19,20 +18,6 @@ static bool halt;
 void (*pm_power_off)(void) = NULL;
 static unsigned long mem_size;
 
-/*
- * Prepare a screen_info structure when console is enabled.
- */
-#if defined(CONFIG_DUMMY_CONSOLE)
-struct screen_info screen_info = {
- .orig_video_lines	= CONFIG_DUMMY_CONSOLE_ROWS,
- .orig_video_cols	= CONFIG_DUMMY_CONSOLE_COLUMNS,
- .orig_video_mode	= 0,
- .orig_video_ega_bx	= 0,
- .orig_video_isVGA	= 1,
- .orig_video_points	= 8
-};
-#endif
-
 long lkl_panic_blink(int state)
 {
 	lkl_ops->panic();