diff options
| author | Linus Torvalds | 2009-09-14 17:01:47 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-14 17:01:47 +0200 |
| commit | 0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a (patch) | |
| tree | 432df46039500f5220ae315f1efca9431ea257e3 /arch/x86/boot/video-vesa.c | |
| parent | Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | x86, e820: Guard against array overflowed in __e820_add_region() (diff) | |
| download | kernel-qcow2-linux-0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a.tar.gz kernel-qcow2-linux-0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a.tar.xz kernel-qcow2-linux-0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a.zip | |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, e820: Guard against array overflowed in __e820_add_region()
x86, setup: remove obsolete pre-Kconfig CONFIG_VIDEO_ variables
Diffstat (limited to 'arch/x86/boot/video-vesa.c')
| -rw-r--r-- | arch/x86/boot/video-vesa.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c index 275dd177f198..11e8c6eb80a1 100644 --- a/arch/x86/boot/video-vesa.c +++ b/arch/x86/boot/video-vesa.c @@ -31,7 +31,6 @@ static inline void vesa_store_mode_params_graphics(void) {} static int vesa_probe(void) { -#if defined(CONFIG_VIDEO_VESA) || defined(CONFIG_FIRMWARE_EDID) struct biosregs ireg, oreg; u16 mode; addr_t mode_ptr; @@ -49,8 +48,7 @@ static int vesa_probe(void) vginfo.signature != VESA_MAGIC || vginfo.version < 0x0102) return 0; /* Not present */ -#endif /* CONFIG_VIDEO_VESA || CONFIG_FIRMWARE_EDID */ -#ifdef CONFIG_VIDEO_VESA + set_fs(vginfo.video_mode_ptr.seg); mode_ptr = vginfo.video_mode_ptr.off; @@ -102,9 +100,6 @@ static int vesa_probe(void) } return nmodes; -#else - return 0; -#endif /* CONFIG_VIDEO_VESA */ } static int vesa_set_mode(struct mode_info *mode) |