diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-06-26 10:53:57 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-26 11:02:31 -0700 |
| commit | 2495fbf7effa6868f5d74124ae9b22a57980755b (patch) | |
| tree | 25d6841b34eb0fbef8d8b1dbedeb89f0d2ec8e69 /arch/x86/boot/video-vesa.c | |
| parent | 4075ea8c54a7506844a69f674990241e7766357b (diff) | |
| download | blackbird-op-linux-2495fbf7effa6868f5d74124ae9b22a57980755b.tar.gz blackbird-op-linux-2495fbf7effa6868f5d74124ae9b22a57980755b.zip | |
x86, setup: remove obsolete pre-Kconfig CONFIG_VIDEO_ variables
There were a set of pre-Kconfig configuration variables defined in the
video code. There is absolutely no evidence that they have been
tweaked by anybody in modern history, so just get rid of them and hope
nobody notices. If someone does complain, these should be made real
Kconfig variables.
Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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 c700147d6ffb..d7ef26ba4540 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) |
