diff --git a/[refs] b/[refs] index b5a92f0b6da2..0e20a41c2efd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b710763608f1bfc8d4cd346e508f3f4878af361e +refs/heads/master: 1a8514e04e3f0249a75f66225e99cdf48d305be7 diff --git a/trunk/arch/x86/boot/main.c b/trunk/arch/x86/boot/main.c index 1f95750ede28..22ca62ba40c8 100644 --- a/trunk/arch/x86/boot/main.c +++ b/trunk/arch/x86/boot/main.c @@ -131,9 +131,6 @@ void main(void) /* Set keyboard repeat rate (why?) */ keyboard_set_repeat(); - /* Set the video mode */ - set_video(); - /* Query MCA information */ query_mca(); @@ -154,6 +151,10 @@ void main(void) #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) query_edd(); #endif + + /* Set the video mode */ + set_video(); + /* Do the last things and invoke protected mode */ go_to_protected_mode(); }