git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[safe/jmp/linux-2.6]
/
arch
/
x86
/
boot
/
compressed
/
misc.c
diff --git
a/arch/x86/boot/compressed/misc.c
b/arch/x86/boot/compressed/misc.c
index
88042e8
..
51e2407
100644
(file)
--- 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;