---

yaml --- r: 21695 b: refs/heads/master c: 293cdab h: refs/heads/master i: 21693: f10cd83 21691: b2af21a 21687: b27d413 21679: e91bf91 21663: c81e885 21631: f17612a v: v3
git-mirror · Mar 8, 2006 · c99eaaf · c99eaaf
1 parent d3abdb7
commit c99eaaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cbe84f33a8d420d8c8228599bc042cb31c569fa
+refs/heads/master: 293cdaba3f6663f630bcb85077206e55b581ed67
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -2624,7 +2624,7 @@ struct saa7134_board saa7134_boards[] = {
 		.tuner_addr	= ADDR_UNSET,
 		.radio_addr	= ADDR_UNSET,
 		.gpiomask	= 0x00200000,
-		.mpeg           = SAA7134_MPEG_DVB,	/* FIXME: DVB not implemented yet */
+		.mpeg           = SAA7134_MPEG_DVB,
 		.inputs         = {{
 			.name = name_tv,	/* Analog broadcast/cable TV */
 			.vmux = 1,
@@ -3549,6 +3549,12 @@ int saa7134_board_init2(struct saa7134_dev *dev)
 		}
 		break;
 	case SAA7134_BOARD_FLYDVB_TRIO:
+		{
+		u8 data[] = { 0x3c, 0x33, 0x62};
+		struct i2c_msg msg = {.addr=0x09, .flags=0, .buf=data, .len = sizeof(data)};
+		i2c_transfer(&dev->i2c_adap, &msg, 1);
+		}
+		break;
 	case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:
 		/* make the tda10046 find its eeprom */
 		{