From: robertmh <robertmh@localhost>
Date: Mon, 4 May 2009 18:59:12 +0000 (+0000)
Subject: 2009-05-04  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Tag: 1.98~941
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c1d00cdc4fbdcc554ec1a383f34ece23123a65d;p=thirdparty%2Fgrub.git

2009-05-04  Robert Millan  <rmh.grub@aybabtu.com>

        * loader/i386/linux.c [GRUB_MACHINE_PCBIOS] (grub_cmd_linux): Fix
        build error.
---

diff --git a/ChangeLog b/ChangeLog
index ef10ba69e..961756e6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-04  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* loader/i386/linux.c [GRUB_MACHINE_PCBIOS] (grub_cmd_linux): Fix
+	build error.
+
 2009-05-04  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/i386/linux.c (grub_cmd_linux): Make "vga=" compatibility
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 3275bc6e2..1a237108b 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -650,8 +650,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	if (grub_errno)
 	  goto fail;
       }
+    else
 #endif /* GRUB_MACHINE_PCBIOS */
-    else if (grub_memcmp (argv[i], "mem=", 4) == 0)
+    if (grub_memcmp (argv[i], "mem=", 4) == 0)
       {
 	char *val = argv[i] + 4;