projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "fbdev: ignore VESA modes if framebuffer is disabled"
[firefly-linux-kernel-4.4.55.git]
/
arch
/
i386
/
boot
/
video.S
diff --git
a/arch/i386/boot/video.S
b/arch/i386/boot/video.S
index 5e2280cf4456296feffb3a815dc937deccf59cfc..8143c9516cb429ebdacf3e2fa3f2c7b10bec963e 100644
(file)
--- a/
arch/i386/boot/video.S
+++ b/
arch/i386/boot/video.S
@@
-496,11
+496,9
@@
mode_set:
cmpb $VIDEO_FIRST_V7>>8, %ah
jz setv7
-#ifdef CONFIG_FB
cmpb $VIDEO_FIRST_VESA>>8, %ah
jnc check_vesa
-#endif
-
+
orb %ah, %ah
jz setmenu