Re: [FBDEV BK] Updates and fixes.

[Linus Torvalds]

On Mon, 14 Apr 2003, James Simmons wrote:
> 
> Linus, please do a
> 
> 	bk pull http://fbdev.bkbits.net/fbdev-2.5

This seems to cause

	arch/i386/boot/setup.o(.text+0x9a4): In function `video':
	: undefined reference to `store_edid'

which is apparently because I don't configure VIDEO_SELECT.

I did this to make it compile, but you should check what the real issue 
is.

		Linus
----
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1034  -> 1.1035 
#	arch/i386/boot/video.S	1.6     -> 1.7    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/04/14	[e-mail]	1.1035
# Store EDID only when CONFIG_VIDEO_SELECT is set and edid
# function actually exists.
# --------------------------------------------
#
diff -Nru a/arch/i386/boot/video.S b/arch/i386/boot/video.S
--- a/arch/i386/boot/video.S	Mon Apr 14 12:14:46 2003
+++ b/arch/i386/boot/video.S	Mon Apr 14 12:14:46 2003
@@ -133,9 +133,9 @@
 #ifdef CONFIG_VIDEO_RETAIN
 	call	restore_screen			# Restore screen contents
 #endif /* CONFIG_VIDEO_RETAIN */
+	call	store_edid
 #endif /* CONFIG_VIDEO_SELECT */
 	call	mode_params			# Store mode parameters
-	call	store_edid
 	popw	%ds				# Restore original DS
 	ret