aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-30 17:57:28 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-02 03:56:07 -0400
commitc097b04520a3ab69a94f63f3f1d6716864c07300 (patch)
tree59f0922c5ec1f2008c2e2cfcbb46f4f6c5f7f665 /drivers/media
parent0020d3ef915fc01a0184bc96eeb3c240bded5d8e (diff)
V4L/DVB (3696): Previous change for cx2341X boards broke the remote support
Partially revert previous change to fix IR support. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/ir-kbd-i2c.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index fe76379ccef7..7e66d83fe0ce 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -400,7 +400,6 @@ static int ir_probe(struct i2c_adapter *adap)
400 */ 400 */
401 401
402 static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1}; 402 static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
403 static const int probe_cx2341x[] = { 0x18, 0x7a, -1};
404 static const int probe_saa7134[] = { 0x7a, 0x47, -1 }; 403 static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
405 static const int probe_em28XX[] = { 0x30, 0x47, -1 }; 404 static const int probe_em28XX[] = { 0x30, 0x47, -1 };
406 const int *probe = NULL; 405 const int *probe = NULL;
@@ -413,7 +412,7 @@ static int ir_probe(struct i2c_adapter *adap)
413 probe = probe_bttv; 412 probe = probe_bttv;
414 break; 413 break;
415 case I2C_HW_B_CX2341X: 414 case I2C_HW_B_CX2341X:
416 probe = probe_cx2341x; 415 probe = probe_bttv;
417 break; 416 break;
418 case I2C_HW_SAA7134: 417 case I2C_HW_SAA7134:
419 probe = probe_saa7134; 418 probe = probe_saa7134;