diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 20:26:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 20:26:05 +0200 |
| commit | ac8d513a6801c8636922ccf4f30211810c9a56ce (patch) | |
| tree | 83ba584487a6a612c8fcf2563c28c0263df35ba2 /arch/x86/boot/video-vesa.c | |
| parent | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (diff) | |
| parent | 99bc47067910f7070e65ee318a6dd79a2371f1e5 (diff) | |
Merge branch 'master' into for-linus
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 275dd177f19..11e8c6eb80a 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) |