diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 20:10:09 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 20:10:09 -0200 |
| commit | 07310480aa20dd3b3ba3bc0c5cd96a0cab6e63a5 (patch) | |
| tree | 858fdb806d06a1b121bd3eb2a725357150a9c3f7 /linux/drivers/media/video/saa7134 | |
| parent | 5e175b73ce763bcf08352450b452f43928285236 (diff) | |
| download | mediapointer-dvb-s2-07310480aa20dd3b3ba3bc0c5cd96a0cab6e63a5.tar.gz mediapointer-dvb-s2-07310480aa20dd3b3ba3bc0c5cd96a0cab6e63a5.tar.bz2 | |
saa7134: fix a merge conflict on Behold H6 board
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index d4c9de9fd..0bbb97b1b 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1370,11 +1370,11 @@ static int dvb_init(struct saa7134_dev *dev) goto dettach_frontend; break; case SAA7134_BOARD_BEHOLD_H6: - dev->dvb.frontend = dvb_attach(zl10353_attach, + fe0->dvb.frontend = dvb_attach(zl10353_attach, &behold_h6_config, &dev->i2c_adap); - if (dev->dvb.frontend) { - dvb_attach(simple_tuner_attach, dev->dvb.frontend, + if (fe0->dvb.frontend) { + dvb_attach(simple_tuner_attach, fe0->dvb.frontend, &dev->i2c_adap, 0x61, TUNER_PHILIPS_FMD1216ME_MK3); } |