diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:06:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:06:25 -0700 |
| commit | ab8aadbda7d59d4674ef614cba2a67c50667a6af (patch) | |
| tree | 836c91ed751ec6e93209a1bfdd46ce36f96ce80e /arch/x86/boot/video-vga.c | |
| parent | 8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0 (diff) | |
| parent | 499a00e92dd9a75395081f595e681629eb1eebad (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, Calgary: Increase max PHB number
x86: Fix rebooting on Dell Precision WorkStation T7400
x86: Fix vsyscall on gcc 4.5 with -Os
x86, pat: Proper init of memtype subtree_max_end
um, hweight: Fix UML boot crash due to x86 optimized hweight
x86, setup: Set ax register in boot vga query
percpu, x86: Avoid warnings of unused variables in per cpu
x86, irq: Rename gsi_end gsi_top, and fix off by one errors
x86: use __ASSEMBLY__ rather than __ASSEMBLER__
Diffstat (limited to 'arch/x86/boot/video-vga.c')
| -rw-r--r-- | arch/x86/boot/video-vga.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c index ed7aeff786b2..45bc9402aa49 100644 --- a/arch/x86/boot/video-vga.c +++ b/arch/x86/boot/video-vga.c @@ -41,13 +41,12 @@ static __videocard video_vga; static u8 vga_set_basic_mode(void) { struct biosregs ireg, oreg; - u16 ax; u8 mode; initregs(&ireg); /* Query current mode */ - ax = 0x0f00; + ireg.ax = 0x0f00; intcall(0x10, &ireg, &oreg); mode = oreg.al; |