diff --git a/[refs] b/[refs] index 623291bbb172..759872a4af8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc0384917bf69079088701a0725c5fc6b554bf35 +refs/heads/master: 5314d48ed54c1a0111c597d1510f77850a1b3232 diff --git a/trunk/include/asm-x86/setup.h b/trunk/include/asm-x86/setup.h index a07c6f1c01e1..946f8f20e91c 100644 --- a/trunk/include/asm-x86/setup.h +++ b/trunk/include/asm-x86/setup.h @@ -41,6 +41,7 @@ struct x86_quirks { }; extern struct x86_quirks *x86_quirks; +extern unsigned long saved_video_mode; #ifndef CONFIG_PARAVIRT #define paravirt_post_allocator_init() do {} while (0)