Skip to content

Commit

Permalink
v4l/dvb: add statics to avoid multiple definitions
Browse files Browse the repository at this point in the history
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Apr 26, 2008
1 parent bc84e0a commit b1721d0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/media/dvb/dvb-usb/dib0700_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/video/cx23885/cx23885-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit b1721d0

Please sign in to comment.