Fix a mismerge

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-11-13 12:52:21 +01:00
parent 4e01c8c165
commit 383ceaf060

View file

@ -78,8 +78,7 @@ grub_plan9_boot (void)
.edi = 0, .edi = 0,
.esp = 0, .esp = 0,
.ebp = 0, .ebp = 0,
.esi = 0, .esi = 0
.a20 = 1
}; };
grub_video_set_mode ("text", 0, 0); grub_video_set_mode ("text", 0, 0);