aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-i2c.c
diff options
context:
space:
mode:
authorThomas Genty <tomlohave@gmail.com>2006-11-29 19:57:24 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 06:05:29 -0500
commit177aaaf826856cd8c82e790cf125186b5634f492 (patch)
tree2af2452c7839496ba7c7becc1b5e7e975159f9ad /drivers/media/video/ir-kbd-i2c.c
parent4be3276a66c09e68a539253ce660913bb2585984 (diff)
V4L/DVB (4898): Saa7134: add support for remote control of Hauppauge HVR1110
This patch adds support for the remote control bundled with the Hauppauge HVR1110 Signed-off-by: Thomas Genty <tomlohave@gmail.com> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r--drivers/media/video/ir-kbd-i2c.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index dd6341f2e390..59edf58204de 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -354,6 +354,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
354 break; 354 break;
355 case 0x7a: 355 case 0x7a:
356 case 0x47: 356 case 0x47:
357 case 0x71:
357 /* Handled by saa7134-input */ 358 /* Handled by saa7134-input */
358 name = "SAA713x remote"; 359 name = "SAA713x remote";
359 ir_type = IR_TYPE_OTHER; 360 ir_type = IR_TYPE_OTHER;
@@ -448,7 +449,7 @@ static int ir_probe(struct i2c_adapter *adap)
448 */ 449 */
449 450
450 static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1}; 451 static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
451 static const int probe_saa7134[] = { 0x7a, 0x47, -1 }; 452 static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, -1 };
452 static const int probe_em28XX[] = { 0x30, 0x47, -1 }; 453 static const int probe_em28XX[] = { 0x30, 0x47, -1 };
453 const int *probe = NULL; 454 const int *probe = NULL;
454 struct i2c_client c; 455 struct i2c_client c;