Pull acpi_bus_register_driver into release branch

[pandora-kernel.git] / arch / i386 / boot / video.S

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 92f6694..c9343c3 100644 (file)
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -97,7 +97,7 @@
 #define PARAM_VESAPM_OFF       0x30
 #define PARAM_LFB_PAGES                0x32
 #define PARAM_VESA_ATTRIB      0x34
-#define PARAM_CAPABILITIES      0x36
+#define PARAM_CAPABILITIES     0x36
 
 /* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
 #ifdef CONFIG_VIDEO_RETAIN
@@ -235,8 +235,8 @@ mopar_gr:
        movl    %eax, %fs:(PARAM_LFB_SIZE)
 
 # store mode capabilities
-       movl    10(%di), %eax
-       movl    %eax, %fs:(PARAM_CAPABILITIES)
+       movl 10(%di), %eax
+       movl %eax, %fs:(PARAM_CAPABILITIES)
 
 # switching the DAC to 8-bit is for <= 8 bpp only
        movw    %fs:(PARAM_LFB_DEPTH), %ax
@@ -1929,6 +1929,7 @@ skip10:   movb    %ah, %al
        ret
 
 store_edid:
+#ifdef CONFIG_FB_FIRMWARE_EDID
        pushw   %es                             # just save all registers
        pushw   %ax
        pushw   %bx
@@ -1959,6 +1960,7 @@ store_edid:
        popw    %bx
        popw    %ax
        popw    %es
+#endif
        ret
 
 # VIDEO_SELECT-only variables