diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 19:10:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 17:12:38 -0200 |
| commit | b0c4be8cffb3f466759ddf621a74a10093537521 (patch) | |
| tree | b657a2aea55ec51eade62c713ac4c5f361ce234f /drivers/media | |
| parent | 47aeba5addd88b178438ba9000600b9844ca0ee1 (diff) | |
| download | linux-3.10-b0c4be8cffb3f466759ddf621a74a10093537521.tar.gz linux-3.10-b0c4be8cffb3f466759ddf621a74a10093537521.tar.bz2 linux-3.10-b0c4be8cffb3f466759ddf621a74a10093537521.zip | |
V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index a25a740b558..0776ecf56d2 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c @@ -1366,11 +1366,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); } |