linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / i386 / boot / video.S

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 2f27523..2ac40c8 100644 (file)
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -126,12 +126,8 @@ video:     pushw   %ds             # We use different segments
        call    mode_set                        # Set the mode
        jc      vid1
 
-#if 0
        leaw    badmdt, %si                     # Invalid mode ID
        call    prtstr
-#else
-       jmp     vid1
-#endif /* CONFIG_VIDEO_IGNORE_BAD_MODE */
 vid2:  call    mode_menu
 vid1:
 #ifdef CONFIG_VIDEO_RETAIN
@@ -1928,36 +1924,36 @@ skip10: movb    %ah, %al
        ret
 
 store_edid:
-       pushw   %es                             # just save all registers 
-       pushw   %ax                             
+       pushw   %es                             # just save all registers
+       pushw   %ax
        pushw   %bx
        pushw   %cx
        pushw   %dx
        pushw   %di
 
-       pushw   %fs                             
+       pushw   %fs
        popw    %es
 
        movl    $0x13131313, %eax               # memset block with 0x13
        movw    $32, %cx
        movw    $0x140, %di
        cld
-       rep 
-       stosl  
+       rep
+       stosl
 
-       movw    $0x4f15, %ax                    # do VBE/DDC 
+       movw    $0x4f15, %ax                    # do VBE/DDC
        movw    $0x01, %bx
        movw    $0x00, %cx
-       movw    $0x01, %dx
+       movw    $0x00, %dx
        movw    $0x140, %di
-       int     $0x10   
+       int     $0x10
 
-       popw    %di                             # restore all registers        
+       popw    %di                             # restore all registers
        popw    %dx
        popw    %cx
        popw    %bx
        popw    %ax
-       popw    %es     
+       popw    %es
        ret
 
 # VIDEO_SELECT-only variables