summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-i2c.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-25 12:10:12 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-02 09:54:50 +0200
commit51dab14e66a876ca124ef115fda08121ad9533fc (patch)
tree95a9a7e692a6816ec4ead85ee0c431521d5f5bed /drivers/media/video/ir-kbd-i2c.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
downloadlinux-51dab14e66a876ca124ef115fda08121ad9533fc.tar.xz
linux-51dab14e66a876ca124ef115fda08121ad9533fc.zip
V4L/DVB (3605): Add support for I2C_HW_B_CX2341X board adapter
- Add missing class check to tveeprom_attach_adapter. - Add CX2341X specific IR probe address list. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> 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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 95bacf435414..fe76379ccef7 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -400,6 +400,7 @@ static int ir_probe(struct i2c_adapter *adap)
*/
static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
+ static const int probe_cx2341x[] = { 0x18, 0x7a, -1};
static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
static const int probe_em28XX[] = { 0x30, 0x47, -1 };
const int *probe = NULL;
@@ -411,6 +412,9 @@ static int ir_probe(struct i2c_adapter *adap)
case I2C_HW_B_BT848:
probe = probe_bttv;
break;
+ case I2C_HW_B_CX2341X:
+ probe = probe_cx2341x;
+ break;
case I2C_HW_SAA7134:
probe = probe_saa7134;
break;