summaryrefslogtreecommitdiff
path: root/arch/x86/boot/video-vga.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-06-26 21:53:57 +0400
committerH. Peter Anvin <hpa@zytor.com>2009-06-26 22:02:31 +0400
commit2495fbf7effa6868f5d74124ae9b22a57980755b (patch)
tree25d6841b34eb0fbef8d8b1dbedeb89f0d2ec8e69 /arch/x86/boot/video-vga.c
parent4075ea8c54a7506844a69f674990241e7766357b (diff)
downloadlinux-2495fbf7effa6868f5d74124ae9b22a57980755b.tar.xz
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-vga.c')
-rw-r--r--arch/x86/boot/video-vga.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c
index 8f8d827e254d..819caa1f2008 100644
--- a/arch/x86/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
@@ -47,14 +47,6 @@ static u8 vga_set_basic_mode(void)
initregs(&ireg);
-#ifdef CONFIG_VIDEO_400_HACK
- if (adapter >= ADAPTER_VGA) {
- ireg.ax = 0x1202;
- ireg.bx = 0x0030;
- intcall(0x10, &ireg, NULL);
- }
-#endif
-
ax = 0x0f00;
intcall(0x10, &ireg, &oreg);
mode = oreg.al;
@@ -62,11 +54,9 @@ static u8 vga_set_basic_mode(void)
set_fs(0);
rows = rdfs8(0x484); /* rows minus one */
-#ifndef CONFIG_VIDEO_400_HACK
if ((oreg.ax == 0x5003 || oreg.ax == 0x5007) &&
(rows == 0 || rows == 24))
return mode;
-#endif
if (mode != 3 && mode != 7)
mode = 3;