The patch number 10154 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Mauro Carvalho Chehab <[email protected]>
saa7134: fix a merge conflict on Behold H6 board
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/video/saa7134/saa7134-dvb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -r ba8072a74727 -r 311a0267354e
linux/drivers/media/video/saa7134/saa7134-dvb.c
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c Tue Dec 23 06:53:03
2008 +0000
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c Tue Dec 30 20:10:09
2008 -0200
@@ -1370,11 +1370,11 @@ static int dvb_init(struct saa7134_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);
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/311a0267354ecc3faaba02afe65df707c36bdac7
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
