From: Adrian Bunk <bunk@fs.tum.de>
To: Andrew Morton <akpm@osdl.org>, Paolo Ornati <ornati@fastwebnet.it>
Cc: linux-kernel@vger.kernel.org
Subject: 2.6.9-rc1-mm2: tdfxfb_lib causes compile error
Date: Tue, 31 Aug 2004 14:04:14 +0200 [thread overview]
Message-ID: <20040831120414.GD3466@fs.tum.de> (raw)
In-Reply-To: <20040830235426.441f5b51.akpm@osdl.org>
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@fs.tum.de>
--- 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
next prev parent reply other threads:[~2004-08-31 12:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-31 6:54 2.6.9-rc1-mm2 Andrew Morton
2004-08-31 8:51 ` 2.6.9-rc1-mm2 Inconsistent kallsyms Helge Hafting
2004-08-31 9:02 ` Andrew Morton
2004-09-01 10:45 ` Helge Hafting
2004-08-31 11:05 ` Paulo Marques
2004-08-31 12:04 ` Adrian Bunk [this message]
2004-08-31 17:21 ` 2.6.9-rc1-mm2 (compile stats) John Cherry
2004-08-31 17:41 ` [patch] 2.6.9-rc1-mm2: char/pcxx.c doesn't compile Adrian Bunk
2004-08-31 20:18 ` Jesper Juhl
2004-08-31 20:17 ` Adrian Bunk
2004-08-31 20:27 ` Jesper Juhl
2004-08-31 17:47 ` 2.6.9-rc1-mm2: why is DIGIEPCA marked BROKEN? Adrian Bunk
2004-08-31 19:57 ` Christoph Hellwig
2004-08-31 19:59 ` Adrian Bunk
2004-08-31 18:53 ` 2.6.9-rc1-mm2 Martin J. Bligh
2004-08-31 19:16 ` 2.6.9-rc1-mm2 Gene Heskett
2004-08-31 19:45 ` 2.6.9-rc1-mm2 Martin J. Bligh
2004-08-31 19:26 ` 2.6.9-rc1-mm2 Andrew Morton
2004-08-31 18:54 ` 2.6.9-rc1-mm2 Gene Heskett
2004-08-31 19:41 ` 2.6.9-rc1-mm2 Sam Ravnborg
2004-09-01 17:35 ` 2.6.9-rc1-mm2 Tom Rini
2004-09-01 19:23 ` 2.6.9-rc1-mm2 Sam Ravnborg
2004-08-31 22:13 ` 2.6.9-rc1-mm2 Rick Lindsley
2004-09-01 21:07 ` 2.6.9-rc1-mm2: IP_NF_COMPAT_IPCHAINS compilation broken Adrian Bunk
2004-09-01 7:15 ` 2.6.9-rc1-mm2 Andre Eisenbach
2004-09-01 7:25 ` 2.6.9-rc1-mm2 William Lee Irwin III
2004-09-01 9:15 ` 2.6.9-rc1-mm2 Andre Eisenbach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040831120414.GD3466@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ornati@fastwebnet.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.