diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:43:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:43:53 -0800 |
| commit | f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 (patch) | |
| tree | 0fae4978f63219b30ae0039a6a05c93df950fd37 /arch/x86/boot/compressed/misc.c | |
| parent | d6cd4715e21508bebbb1928c91d628bd65f5de5f (diff) | |
| parent | 8e92dc767abb58357e696a48fc3d8ce615a9c01a (diff) | |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, setup: Don't skip mode setting for the standard VGA modes
x86-64, setup: Inhibit decompressor output if video info is invalid
x86, setup: When restoring the screen, update boot_params.screen_info
Diffstat (limited to 'arch/x86/boot/compressed/misc.c')
| -rw-r--r-- | arch/x86/boot/compressed/misc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 88042e812d3c..51e240779a44 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -180,11 +180,9 @@ static void __putstr(int error, const char *s) return; #endif -#ifdef CONFIG_X86_32 if (real_mode->screen_info.orig_video_mode == 0 && lines == 0 && cols == 0) return; -#endif x = real_mode->screen_info.orig_x; y = real_mode->screen_info.orig_y; |