diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-25 00:53:34 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-25 00:53:34 +0000 |
| commit | 3cc5f4b65c2a7cc8aae113cf8749ef7ccb714a50 (patch) | |
| tree | 95a5fd124cdbef4dd06c4f0477633b77c8e2e0fb /linux | |
| parent | a6b6e4a50a6e773ced47026223985ff1322b9a8e (diff) | |
| download | mediapointer-dvb-s2-3cc5f4b65c2a7cc8aae113cf8749ef7ccb714a50.tar.gz mediapointer-dvb-s2-3cc5f4b65c2a7cc8aae113cf8749ef7ccb714a50.tar.bz2 | |
xc3028_{agc,bw}_config namespace fix
From: Adrian Bunk <bunk@kernel.org>
This patch fixes the following build error:
<-- snip -->
...
LD drivers/media/built-in.o
drivers/media/dvb/built-in.o:(.data+0x1be6c): multiple definition of `xc3028_agc_config'
drivers/media/video/built-in.o:(.data+0x36500): first defined here
drivers/media/dvb/built-in.o:(.data+0x1be9c): multiple definition of `xc3028_bw_config'
drivers/media/video/built-in.o:(.data+0x36530): first defined here
make[3]: *** [drivers/media/built-in.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-dvb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c index 6477fc66c..346223856 100644 --- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -299,7 +299,7 @@ static int stk7700d_tuner_attach(struct dvb_usb_adapter *adap) } /* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */ -struct dibx000_agc_config xc3028_agc_config = { +static struct dibx000_agc_config xc3028_agc_config = { BAND_VHF | BAND_UHF, /* band_caps */ /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0, @@ -342,7 +342,7 @@ struct dibx000_agc_config xc3028_agc_config = { }; /* PLL Configuration for COFDM BW_MHz = 8.00 with external clock = 30.00 */ -struct dibx000_bandwidth_config xc3028_bw_config = { +static struct dibx000_bandwidth_config xc3028_bw_config = { 60000, 30000, /* internal, sampling */ 1, 8, 3, 1, 0, /* pll_cfg: prediv, ratio, range, reset, bypass */ 0, 0, 1, 1, 0, /* misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc, diff --git a/linux/drivers/media/video/cx23885/cx23885-dvb.c b/linux/drivers/media/video/cx23885/cx23885-dvb.c index e0c898076..8695f5c5a 100644 --- a/linux/drivers/media/video/cx23885/cx23885-dvb.c +++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c @@ -192,7 +192,7 @@ static struct tda18271_config hauppauge_hvr1200_tuner_config = { .gate = TDA18271_GATE_ANALOG, }; -struct dibx000_agc_config xc3028_agc_config = { +static struct dibx000_agc_config xc3028_agc_config = { BAND_VHF | BAND_UHF, /* band_caps */ /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0, @@ -238,7 +238,7 @@ struct dibx000_agc_config xc3028_agc_config = { /* PLL Configuration for COFDM BW_MHz = 8.000000 * With external clock = 30.000000 */ -struct dibx000_bandwidth_config xc3028_bw_config = { +static struct dibx000_bandwidth_config xc3028_bw_config = { 60000, /* internal */ 30000, /* sampling */ 1, /* pll_cfg: prediv */ |