From 4dca019384de5d9c95a6f6f49b80388739117dcf Mon Sep 17 00:00:00 2001 From: Paolo Ornati Date: Mon, 30 Aug 2004 20:37:30 -0700 Subject: [PATCH] [PATCH] tdfx linkage fix drivers/built-in.o(.data+0x40a68): undefined reference to `cfb_fillrect' drivers/built-in.o(.data+0x40a6c): undefined reference to `cfb_copyarea' 3dfx framebuffer driver depends on "cfb_fillrect.c" and "cfb_copyarea.c" if it's compiled without CONFIG_FB_3DFX_ACCEL turned on... Signed-off-by: Paolo Ornati Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 8033b89981d93..2cdf66c923758 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -34,7 +34,11 @@ obj-$(CONFIG_FB_CYBER) += cyberfb.o obj-$(CONFIG_FB_CYBER2000) += cyber2000fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 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 +obj-$(CONFIG_FB_3DFX) += tdfxfb.o tdfxfb_lib.o +tdfxfb_lib-y := cfbimgblt.o +ifneq ($(CONFIG_FB_3DFX_ACCEL),y) +tdfxfb_lib-y += 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 -- 2.53.0