diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-31 00:57:28 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-31 00:57:28 +0200 |
| commit | 950e8155e83cdf480a41449cf024494b6ec25e69 (patch) | |
| tree | 417c6f250d407a7952cca9b3863ae9fb4b20036d /linux/drivers/media/video | |
| parent | 9875f670afe53a6edd3a2b7852b4ee592eef4160 (diff) | |
| download | mediapointer-dvb-s2-950e8155e83cdf480a41449cf024494b6ec25e69.tar.gz mediapointer-dvb-s2-950e8155e83cdf480a41449cf024494b6ec25e69.tar.bz2 | |
Previous change for cx2341X boards broke the remote support
From: Hans Verkuil <hverkuil@xs4all.nl>
Partially revert previous change to fix IR support.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index ab1c47648..15ce0ff08 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -410,7 +410,6 @@ 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; @@ -423,7 +422,7 @@ static int ir_probe(struct i2c_adapter *adap) probe = probe_bttv; break; case I2C_HW_B_CX2341X: - probe = probe_cx2341x; + probe = probe_bttv; break; case I2C_HW_SAA7134: probe = probe_saa7134; |