summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-13 17:32:22 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-13 17:32:22 -0200
commitf4b0dc814babaa02303f9cfbc6f8364d0a40b14d (patch)
tree071cb5259aace2d308ca8b0bb5da738eb81c8953 /linux/drivers/media/video
parent3ba8b535d2a607ac624f4c7d5cdab9187514c747 (diff)
parentae5e0bd6101a2b5eed55d740487c8d30f837907f (diff)
downloadmediapointer-dvb-s2-f4b0dc814babaa02303f9cfbc6f8364d0a40b14d.tar.gz
mediapointer-dvb-s2-f4b0dc814babaa02303f9cfbc6f8364d0a40b14d.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/s5h1409
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-dvb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-dvb.c b/linux/drivers/media/video/cx23885/cx23885-dvb.c
index c21d21511..36e5dd22a 100644
--- a/linux/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c
@@ -86,7 +86,7 @@ static struct s5h1409_config hauppauge_generic_config = {
.demod_address = 0x32 >> 1,
.output_mode = S5H1409_SERIAL_OUTPUT,
.gpio = S5H1409_GPIO_ON,
- .if_freq = 44000,
+ .qam_if = 44000,
.inversion = S5H1409_INVERSION_OFF,
.status_mode = S5H1409_DEMODLOCKING
};
@@ -95,7 +95,7 @@ static struct s5h1409_config hauppauge_hvr1800lp_config = {
.demod_address = 0x32 >> 1,
.output_mode = S5H1409_SERIAL_OUTPUT,
.gpio = S5H1409_GPIO_OFF,
- .if_freq = 44000,
+ .qam_if = 44000,
.inversion = S5H1409_INVERSION_OFF,
.status_mode = S5H1409_DEMODLOCKING
};