diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:31:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:31:05 -0700 |
| commit | b2d597cb6d64d5e30236273249e3790434387743 (patch) | |
| tree | 2ab7b15d2223212d7f71b9ccd50b69621bad5dd8 /arch/i386/boot/video.c | |
| parent | edd5f25f7475013b44f7942bb3b25022792a9c9d (diff) | |
| parent | 9a5f35d4ede43fee791a486e0850e9e3afdde0a7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] edd.c: make sure MBR signatures actually get reported
[x86 setup] Don't use EDD to get the MBR signature
[x86 setup] The current display page is returned in %bh, not %bl
Diffstat (limited to 'arch/i386/boot/video.c')
| -rw-r--r-- | arch/i386/boot/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/boot/video.c b/arch/i386/boot/video.c index 958130ef004..693f20d3102 100644 --- a/arch/i386/boot/video.c +++ b/arch/i386/boot/video.c @@ -61,7 +61,7 @@ static void store_video_mode(void) /* Not all BIOSes are clean with respect to the top bit */ boot_params.screen_info.orig_video_mode = ax & 0x7f; - boot_params.screen_info.orig_video_page = page; + boot_params.screen_info.orig_video_page = page >> 8; } /* |