summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Ornati <ornati@fastwebnet.it>2004-09-02 20:44:40 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-09-02 20:44:40 -0700
commit996a2018bb27f12dfff6ddc4004f58c9a6d84d49 (patch)
tree3bf2c3ebbb43846e853260e5f41525724d50d219
parent6b332749bf8c09b41f65ad8721c45a204ca8002a (diff)
[PATCH] tdfxfb linkage fix v2.0 (the previous one is broken)
This patch _really_ fixes tdfxfb linkage
-rw-r--r--drivers/video/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 2cdf66c92375..1a10411a4be7 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -34,10 +34,9 @@ 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 tdfxfb_lib.o
-tdfxfb_lib-y := cfbimgblt.o
+obj-$(CONFIG_FB_3DFX) += tdfxfb.o cfbimgblt.o
ifneq ($(CONFIG_FB_3DFX_ACCEL),y)
-tdfxfb_lib-y += cfbfillrect.o cfbcopyarea.o
+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