Merge branch 'x86/core' into x86/apic

[karo-tx-linux.git] / include / asm-x86 / setup.h

diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
index 80fcc0de80be3755e7e9666b8bd5b78b5aa57d97..11b6cc14b289686f3eff7ae2d908540fc866b747 100644 (file)
--- a/include/asm-x86/setup.h
+++ b/include/asm-x86/setup.h
@@ -42,6 +42,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)