From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 30 Dec 2008 22:10:09 +0000 (-0300)
Subject: V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board
X-Git-Tag: v2.6.29-rc1~523^2~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b0c4be8cffb3f466759ddf621a74a10093537521;p=linux-2.6-omap-h63xx.git

V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

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);
 		}