aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/boot/video.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 08:01:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 08:01:47 -0700
commit0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a (patch)
tree432df46039500f5220ae315f1efca9431ea257e3 /arch/x86/boot/video.c
parent55e0715f612f19b44c17497929091df2f3357e5d (diff)
parent5051fd69773d2d044734b78516317a04d3774871 (diff)
downloadlinux-stericsson-0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a.tar.gz
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.c')
-rw-r--r--arch/x86/boot/video.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index bad728b76fc2..d42da3802499 100644
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -221,7 +221,6 @@ static unsigned int mode_menu(void)
}
}
-#ifdef CONFIG_VIDEO_RETAIN
/* Save screen content to the heap */
static struct saved_screen {
int x, y;
@@ -299,10 +298,6 @@ static void restore_screen(void)
ireg.dl = saved.curx;
intcall(0x10, &ireg, NULL);
}
-#else
-#define save_screen() ((void)0)
-#define restore_screen() ((void)0)
-#endif
void set_video(void)
{