xc3028_{agc,bw}_config namespace fix
PATCH 1/1 xc3028_{agc,bw}_config namespace fix
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 <[email protected]>
---
drivers/media/dvb/dvb-usb/dib0700_devices.c | 4 ++-- drivers/media/video/cx23885/cx23885-dvb.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
7c8ba386f39d5e17821e37999ce9d484878af751 diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 6477fc6..3462238 100644
drivers/media/dvb/dvb-usb/dib0700_devices.c +2 -2
@@ -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,
drivers/media/video/cx23885/cx23885-dvb.c +2 -2
@@ -191,7 +191,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,
@@ -237,7 +237,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 */