From 5e37b6ad48b3edd41477d7a4941e1c7f71921a40 Mon Sep 17 00:00:00 2001
From: Dmitri Belimov <d.belimov@gmail.com>
Date: Tue, 23 Dec 2008 03:51:38 -0300
Subject: [PATCH] --- yaml --- r: 125535 b: refs/heads/master c:
 f204ae40ad79bbf50d85427a5cf39fcebdb4a993 h: refs/heads/master i:   125533:
 55a599ba735a2c56ee5dc371e8f164cf9f08c617   125531:
 384b769016d5c1f51d2a6714c32e2dad2c96ed78   125527:
 6091f7ad80101fcdb5eb6805cc61fd0d547fe1a2   125519:
 675bff566b98a69599b2852d0bf2876ddfd51231   125503:
 94d7f84272720a67e1a172aea9860cd2c05a28ac v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-cards.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 161bed29e6a9..c837fd121ee5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 899a6f67b90206c330bd93c7c8f3f8bb8b80397a
+refs/heads/master: f204ae40ad79bbf50d85427a5cf39fcebdb4a993
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index a2e3f6729c5b..e240b4baf0ed 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -4462,6 +4462,7 @@ struct saa7134_board saa7134_boards[] = {
 		.tuner_addr     = ADDR_UNSET,
 		.radio_addr     = ADDR_UNSET,
 		.tda9887_conf   = TDA9887_PRESENT,
+		.mpeg           = SAA7134_MPEG_DVB,
 		.inputs         = {{
 			.name = name_tv,
 			.vmux = 3,
@@ -4480,8 +4481,6 @@ struct saa7134_board saa7134_boards[] = {
 			.name = name_radio,
 			.amux = LINE2,
 		},
-		/* no DVB support for now */
-		/* .mpeg           = SAA7134_MPEG_DVB, */
 	},
 	[SAA7134_BOARD_ASUSTeK_TIGER_3IN1] = {
 		.name           = "Asus Tiger 3in1",
@@ -6025,6 +6024,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
 	case SAA7134_BOARD_BEHOLD_M6:
 	case SAA7134_BOARD_BEHOLD_M63:
 	case SAA7134_BOARD_BEHOLD_M6_EXTRA:
+	case SAA7134_BOARD_BEHOLD_H6:
 		dev->has_remote = SAA7134_REMOTE_I2C;
 		break;
 	case SAA7134_BOARD_AVERMEDIA_A169_B: