diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-25 14:27:29 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-25 14:27:29 +0100 |
| commit | 4751a104ef6a2fd3d290a38a21f32ad03bde6690 (patch) | |
| tree | cfc3f96952c2b322cb5bd6a3a8e9fa56f3a80aaf /linux/drivers/media/video/ir-kbd-i2c.c | |
| parent | 5be880e39653de9ff425724c31dbf5a5b365fd89 (diff) | |
| parent | 39f5161a61908b2803013cfc3150db76de6caaec (diff) | |
| download | mediapointer-dvb-s2-4751a104ef6a2fd3d290a38a21f32ad03bde6690.tar.gz mediapointer-dvb-s2-4751a104ef6a2fd3d290a38a21f32ad03bde6690.tar.bz2 | |
merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
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; |