From 09a5654fad59edc0e44e23c367d9f3c0e3897b9a Mon Sep 17 00:00:00 2001
From: Dmitri Belimov <d.belimov@gmail.com>
Date: Thu, 4 Mar 2010 02:40:37 -0300
Subject: [PATCH] --- yaml --- r: 192767 b: refs/heads/master c:
 2ffbb64c671261c80703cd8b7fec5ebd21e58b0c h: refs/heads/master i:   192765:
 2e17425e44e1ae172a9d0259f5eb67d6272c5261   192763:
 856416b77fc3d5359e6176dfe2cb1c35d3d72562   192759:
 9d9ea0655ee865fb0ed6a76dfd3c4c7f2de4359a   192751:
 277ddb68161b8635955e6ca9633137f6e184a6b7   192735:
 62fd0b0560f7a9e58cf06d2ef5fe443408c5f180   192703:
 8df3c767e6193a6f020943f7bb6554660aaf3eda   192639:
 557d88f94f967486a86e8bc5077e76dd8a87e293   192511:
 9325e2bfdab79e49b7c0cb495169b590fb8ee8d3 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-input.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf9436912e56..bee4969347e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a34d9dfaf3cb690c448fac67923effac08c902d
+refs/heads/master: 2ffbb64c671261c80703cd8b7fec5ebd21e58b0c
diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c
index 58a0cdc8414a..a2b16693ee9a 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-input.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-input.c
@@ -837,6 +837,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
 		dev->init_data.name = "BeholdTV";
 		dev->init_data.get_key = get_key_beholdm6xx;
 		dev->init_data.ir_codes = &ir_codes_behold_table;
+		dev->init_data.type = IR_TYPE_NEC;
 		info.addr = 0x2d;
 		break;
 	case SAA7134_BOARD_AVERMEDIA_CARDBUS_501: