From: robertmh Date: Mon, 4 May 2009 18:40:33 +0000 (+0000) Subject: 2009-05-04 Robert Millan X-Git-Tag: 1.98~942 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b01f05482b5e6050a4ab662a0907fd148eab02cd;p=thirdparty%2Fgrub.git 2009-05-04 Robert Millan * loader/i386/linux.c (grub_cmd_linux): Make "vga=" compatibility parameter only available on BIOS. --- diff --git a/ChangeLog b/ChangeLog index 963c84ce2..ef10ba69e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-05-04 Robert Millan + + * loader/i386/linux.c (grub_cmd_linux): Make "vga=" compatibility + parameter only available on BIOS. + 2009-05-04 Vladimir Serbinenko Removed wrong semicolon in declaration diff --git a/loader/i386/linux.c b/loader/i386/linux.c index ab3b43e27..3275bc6e2 100644 --- a/loader/i386/linux.c +++ b/loader/i386/linux.c @@ -608,6 +608,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), vid_mode = 0; linux_mem_size = 0; for (i = 1; i < argc; i++) +#ifdef GRUB_MACHINE_PCBIOS if (grub_memcmp (argv[i], "vga=", 4) == 0) { /* Video mode selection support. */ @@ -649,6 +650,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), if (grub_errno) goto fail; } +#endif /* GRUB_MACHINE_PCBIOS */ else if (grub_memcmp (argv[i], "mem=", 4) == 0) { char *val = argv[i] + 4;