summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mt20xx.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-01-15 21:31:10 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-01-15 21:31:10 -0200
commit21e2379b9ef705fcb3ba3be738decd3397fc30b7 (patch)
tree6e4f5334547aa538150fe52b60bfe014425eb53b /drivers/media/video/mt20xx.c
parentd04ae27bae42bcce1b3fa70ca2edf25d92b1cf39 (diff)
parent366cc64b0d9ac922ac4f0f54e06c13ec95249928 (diff)
downloadop-kernel-dev-21e2379b9ef705fcb3ba3be738decd3397fc30b7.zip
op-kernel-dev-21e2379b9ef705fcb3ba3be738decd3397fc30b7.tar.gz
Merge branch 'work'
Diffstat (limited to 'drivers/media/video/mt20xx.c')
-rw-r--r--drivers/media/video/mt20xx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 0bf1caa..c7c9f3f8 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -353,8 +353,8 @@ static int mt2032_init(struct i2c_client *c)
} while (xok != 1 );
t->xogc=xogc;
- t->tv_freq = mt2032_set_tv_freq;
- t->radio_freq = mt2032_set_radio_freq;
+ t->set_tv_freq = mt2032_set_tv_freq;
+ t->set_radio_freq = mt2032_set_radio_freq;
return(1);
}
@@ -481,8 +481,8 @@ static int mt2050_init(struct i2c_client *c)
i2c_master_recv(c,buf,1);
tuner_dbg("mt2050: sro is %x\n",buf[0]);
- t->tv_freq = mt2050_set_tv_freq;
- t->radio_freq = mt2050_set_radio_freq;
+ t->set_tv_freq = mt2050_set_tv_freq;
+ t->set_radio_freq = mt2050_set_radio_freq;
return 0;
}
@@ -494,8 +494,8 @@ int microtune_init(struct i2c_client *c)
int company_code;
memset(buf,0,sizeof(buf));
- t->tv_freq = NULL;
- t->radio_freq = NULL;
+ t->set_tv_freq = NULL;
+ t->set_radio_freq = NULL;
t->standby = NULL;
if (t->std & V4L2_STD_525_60) {
tuner_dbg("pinnacle ntsc\n");
OpenPOWER on IntegriCloud