2.6.9-rc1-mm2: tdfxfb_lib causes compile error
From: Adrian Bunk
Date: Tue Aug 31 2004 - 07:06:27 EST
On Mon, Aug 30, 2004 at 11:54:26PM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.9-rc1-mm1:
>...
> +tdfx-linkage-fix.patch
>
> fbdev driver fix
>...
This might result in object files being included twice both directly and
via tdfxfb_lib, resulting in compile errors like the following:
<-- snip -->
...
LD drivers/video/built-in.o
drivers/video/tdfxfb_lib.o(.text+0x0): In function `cfb_imageblit':
: multiple definition of `cfb_imageblit'
drivers/video/cfbimgblt.o(.text+0x0): first defined here
make[2]: *** [drivers/video/built-in.o] Error 1
<-- snip -->
Please replace tdfx-linkage-fix.patch with the following patch:
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
--- linux-2.6.9-rc1-mm1-full/drivers/video/Makefile.old 2004-08-28 10:41:30.000000000 +0200
+++ linux-2.6.9-rc1-mm1-full/drivers/video/Makefile 2004-08-28 10:46:20.000000000 +0200
@@ -35,6 +35,9 @@
obj-$(CONFIG_FB_GBE) += gbefb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_SGIVW) += sgivwfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_3DFX) += tdfxfb.o cfbimgblt.o
+ifneq ($(CONFIG_FB_3DFX_ACCEL),y)
+ obj-$(CONFIG_FB_3DFX) += cfbfillrect.o cfbcopyarea.o
+endif
obj-$(CONFIG_FB_MAC) += macfb.o macmodes.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_HP300) += hpfb.o cfbfillrect.o cfbimgblt.o
obj-$(CONFIG_FB_OF) += offb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/