From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 13 Nov 2011 11:52:21 +0000 (+0100)
Subject: Fix a mismerge
X-Git-Tag: 2.00~939^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=383ceaf0609040610c7ebc8279d958971ca96084;p=thirdparty%2Fgrub.git

Fix a mismerge
---

diff --git a/grub-core/loader/i386/pc/plan9.c b/grub-core/loader/i386/pc/plan9.c
index 73d4eed38..6e49a34b6 100644
--- a/grub-core/loader/i386/pc/plan9.c
+++ b/grub-core/loader/i386/pc/plan9.c
@@ -78,8 +78,7 @@ grub_plan9_boot (void)
     .edi = 0,
     .esp = 0,
     .ebp = 0,
-    .esi = 0,
-    .a20 = 1
+    .esi = 0
   };
   grub_video_set_mode ("text", 0, 0);