diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:25:28 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:26:15 -0400 |
| commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
| tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /arch/x86/boot/video-vesa.c | |
| parent | 19943b0e30b05d42e494ae6fef78156ebc8c637e (diff) | |
| parent | ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'arch/x86/boot/video-vesa.c')
| -rw-r--r-- | arch/x86/boot/video-vesa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c index c700147d6ffb..275dd177f198 100644 --- a/arch/x86/boot/video-vesa.c +++ b/arch/x86/boot/video-vesa.c | |||
| @@ -45,7 +45,7 @@ static int vesa_probe(void) | |||
| 45 | ireg.di = (size_t)&vginfo; | 45 | ireg.di = (size_t)&vginfo; |
| 46 | intcall(0x10, &ireg, &oreg); | 46 | intcall(0x10, &ireg, &oreg); |
| 47 | 47 | ||
| 48 | if (ireg.ax != 0x004f || | 48 | if (oreg.ax != 0x004f || |
| 49 | vginfo.signature != VESA_MAGIC || | 49 | vginfo.signature != VESA_MAGIC || |
| 50 | vginfo.version < 0x0102) | 50 | vginfo.version < 0x0102) |
| 51 | return 0; /* Not present */ | 51 | return 0; /* Not present */ |
| @@ -70,7 +70,7 @@ static int vesa_probe(void) | |||
| 70 | ireg.di = (size_t)&vminfo; | 70 | ireg.di = (size_t)&vminfo; |
| 71 | intcall(0x10, &ireg, &oreg); | 71 | intcall(0x10, &ireg, &oreg); |
| 72 | 72 | ||
| 73 | if (ireg.ax != 0x004f) | 73 | if (oreg.ax != 0x004f) |
| 74 | continue; | 74 | continue; |
| 75 | 75 | ||
| 76 | if ((vminfo.mode_attr & 0x15) == 0x05) { | 76 | if ((vminfo.mode_attr & 0x15) == 0x05) { |