]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Fix a mismerge
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 13 Nov 2011 11:52:21 +0000 (12:52 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 13 Nov 2011 11:52:21 +0000 (12:52 +0100)
grub-core/loader/i386/pc/plan9.c

index 73d4eed3845fe583a0799d8ffd1321d0c9139cc6..6e49a34b636c6e0fdc16eacfcd5070a1452b7189 100644 (file)
@@ -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);