From 383ceaf0609040610c7ebc8279d958971ca96084 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 13 Nov 2011 12:52:21 +0100
Subject: [PATCH] Fix a mismerge

---
 grub-core/loader/i386/pc/plan9.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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);
 
-- 
2.47.2