X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Fi386%2Fboot%2Fvideo.S;h=0000a26745372abd273e6ebba7c040b0946948bc;hb=7bee5c0fd2b25d185650cbfa049823e03f648c09;hp=2ac40c8244c47145fb1d7feae7c42b9fe03bf1d8;hpb=a62e68488dd5ddb07776555fd7e0435c6d021ac1;p=linux-2.6-omap-h63xx.git

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 2ac40c8244c..0000a267453 100644
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -1924,6 +1924,7 @@ skip10:	movb	%ah, %al
 	ret
 
 store_edid:
+#ifdef CONFIG_FB_FIRMWARE_EDID
 	pushw	%es				# just save all registers
 	pushw	%ax
 	pushw	%bx
@@ -1954,6 +1955,7 @@ store_edid:
 	popw	%bx
 	popw	%ax
 	popw	%es
+#endif
 	ret
 
 # VIDEO_SELECT-only variables