From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Nov 2010 12:10:51 +0000 (+0100)
Subject: 	* grub-core/loader/i386/linux.c (grub_cmd_linux): Autoload vbe.mod if
X-Git-Tag: 1.99~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b36fbf49377e4c7faeba2160e395904368d65e1;p=thirdparty%2Fgrub.git

	* grub-core/loader/i386/linux.c (grub_cmd_linux): Autoload vbe.mod if
	vga= option is supplied.
---

diff --git a/ChangeLog b/ChangeLog
index 20bf05920..6c6f75ba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/loader/i386/linux.c (grub_cmd_linux): Autoload vbe.mod if
+	vga= option is supplied.
+
 2010-11-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub.d/10_hurd.in: Don't call savedefault on recovery entries.
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index d7622dabd..de4bec106 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -719,6 +719,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	grub_err_t err;
 	char *buf;
 
+	grub_dl_load ("vbe");
+
 	if (grub_strcmp (val, "normal") == 0)
 	  vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
 	else if (grub_strcmp (val, "ext") == 0)