lkml.org 
[lkml]   [2004]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] 2.6.10-rc2-mm3: DVB: philips_tdm1316l_config multiple definition
On Sun, Nov 21, 2004 at 10:39:29PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.10-rc2-mm2:
>...
> +dvb-follow-frontend-changes-in-drivers.patch
>...
> +dvb-follow-changes-in-dvb-ttpci-and-budget-drivers.patch
>
> Big DVB update
>...

<-- snip -->

...
LD drivers/media/dvb/built-in.o
drivers/media/dvb/ttusb-budget/built-in.o(.data+0x3364): multiple
definition of `philips_tdm1316l_config'
drivers/media/dvb/ttpci/built-in.o(.data+0x8c8): first defined here
make[3]: *** [drivers/media/dvb/built-in.o] Error 1

<-- snip -->


Since none of them has a good reason for being global, the patch below
makes both static.


diffstat output:
drivers/media/dvb/ttpci/budget-ci.c | 2 +-
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc2-mm3-full/drivers/media/dvb/ttpci/budget-ci.c.old 2004-11-22 14:48:33.000000000 +0100
+++ linux-2.6.10-rc2-mm3-full/drivers/media/dvb/ttpci/budget-ci.c 2004-11-22 14:48:45.000000000 +0100
@@ -840,7 +840,7 @@
return request_firmware(fw, name, &budget_ci->budget.dev->pci->dev);
}

-struct tda1004x_config philips_tdm1316l_config = {
+static struct tda1004x_config philips_tdm1316l_config = {

.demod_address = 0x8,
.invert = 0,
--- linux-2.6.10-rc2-mm3-full/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.old 2004-11-22 14:48:59.000000000 +0100
+++ linux-2.6.10-rc2-mm3-full/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c 2004-11-22 14:49:08.000000000 +0100
@@ -1190,7 +1190,7 @@
return request_firmware(fw, name, &ttusb->dev->dev);
}

-struct tda1004x_config philips_tdm1316l_config = {
+static struct tda1004x_config philips_tdm1316l_config = {

.demod_address = 0x8,
.invert = 1,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:08    [from the cache]
©2003-2011 Jasper Spaans