Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54876
b: refs/heads/master
c: 464bdd3
h: refs/heads/master
v: v3
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed May 8, 2007
1 parent b44dc29 commit 5ec0aaf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66fd14120edea89d353fac0649e9ec0045ec958f
refs/heads/master: 464bdd33e9baad9806c7adbd8dfc37081a55f27e
4 changes: 3 additions & 1 deletion trunk/arch/i386/boot/video.S
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,11 @@ 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

Expand Down

0 comments on commit 5ec0aaf

Please sign in to comment.