Re: 2.5.67-mm3

Rudmer van Dijk
2003-04-14T15:13:05Z

On Monday 14 April 2003 13:03, Bill Huey (Hui) wrote:
> On Mon, Apr 14, 2003 at 01:53:13AM -0700, Andrew Morton wrote:
> > A bunch of new fixes, and a framebuffer update. This should work a bit
> > better than -mm2.
>
> make -f scripts/Makefile.build obj=arch/i386/boot arch/i386/boot/bzImage
> ld -m elf_i386 -Ttext 0x0 -s --oformat binary -e begtext
> arch/i386/boot/setup.o -o arch/i386/boot/setup
> arch/i386/boot/setup.o(.text+0x9a4): In function `video':
> /tmp/ccyhvWWu.s:2925: undefined reference to `store_edid'
> make[1]: *** [arch/i386/boot/setup] Error 1
> make: *** [bzImage] Error 2
>
> ---------------------------------------

got this also.
store_edid is only used when CONFIG_VIDEO_SELECT is set but the call to it is
outside the #ifdef...

this patch fixes it. Maybe it is better to move the call to store_edid up
inside the already avilable #ifdef but I'm not sure if that is possible

Rudmer

--- linux-2.5.67-mm3/arch/i386/boot/video.S.orig 2003-04-14
17:07:24.000000000 +0200
+++ linux-2.5.67-mm3/arch/i386/boot/video.S 2003-04-14 17:03:08.000000000
+0200
@@ -135,7 +135,9 @@
#endif /* CONFIG_VIDEO_RETAIN */
#endif /* CONFIG_VIDEO_SELECT */
call mode_params # Store mode parameters
+#ifdef CONFIG_VIDEO_SELECT
call store_edid
+#endif /* CONFIG_VIDEO_SELECT */
popw %ds # Restore original DS
ret