Merge branch 'linus' into x86/nmi

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / boot.h

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 7822a4983da2376a8b4297cf3bad80a3519c717e..a34b9982c7cbcf928bd96e3b17955a789f226f57 100644 (file)
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -9,8 +9,6 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * arch/i386/boot/boot.h
- *
  * Header file for the real-mode kernel code
  */
 
@@ -286,6 +284,11 @@ int getchar_timeout(void);
 /* video.c */
 void set_video(void);
 
+/* video-mode.c */
+int set_mode(u16 mode);
+int mode_defined(u16 mode);
+void probe_cards(int unsafe);
+
 /* video-vesa.c */
 void vesa_store_edid(void);