diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
| commit | bdf583dd1cbec85e2760a6825d3ddf571c791870 (patch) | |
| tree | a97b66970f20ce2330816ca2a5e3d405a293c7ed /linux/drivers/media/video/ir-kbd-i2c.c | |
| parent | 52e19741ce48048ada5cc3b87c065dec5b100b8d (diff) | |
| parent | afb2abb44347c884e3a8a2ddf7151756c1869d2f (diff) | |
| download | mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.gz mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/ir-kbd-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index 7e3270c37..ab1c47648 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -410,6 +410,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; @@ -421,6 +422,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; |