x86: move suspend wakeup code to C

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / video-bios.c

diff --git a/arch/x86/boot/video-bios.c b/arch/x86/boot/video-bios.c
index ff664a117096d5453708f541f709858f5ffc05f0..39e247e96172a53c24aefbfe1c6a6beae89d01bc 100644 (file)
--- a/arch/x86/boot/video-bios.c
+++ b/arch/x86/boot/video-bios.c
@@ -50,6 +50,7 @@ static int set_bios_mode(u8 mode)
        if (new_mode == mode)
                return 0;       /* Mode change OK */
 
+#ifndef _WAKEUP
        if (new_mode != boot_params.screen_info.orig_video_mode) {
                /* Mode setting failed, but we didn't end up where we
                   started.  That's bad.  Try to revert to the original
@@ -59,13 +60,18 @@ static int set_bios_mode(u8 mode)
                             : "+a" (ax)
                             : : "ebx", "ecx", "edx", "esi", "edi");
        }
+#endif
        return -1;
 }
 
 static int bios_probe(void)
 {
        u8 mode;
+#ifdef _WAKEUP
+       u8 saved_mode = 0x03;
+#else
        u8 saved_mode = boot_params.screen_info.orig_video_mode;
+#endif
        u16 crtc;
        struct mode_info *mi;
        int nmodes = 0;