diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-31 00:57:28 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 09:56:07 +0200 |
| commit | c097b04520a3ab69a94f63f3f1d6716864c07300 (patch) | |
| tree | 59f0922c5ec1f2008c2e2cfcbb46f4f6c5f7f665 /drivers/media/video/ir-kbd-i2c.c | |
| parent | V4L/DVB (3693): Fix msp3400c and bttv stereo/mono/bilingual detection/handling (diff) | |
| download | linux-c097b04520a3ab69a94f63f3f1d6716864c07300.tar.xz linux-c097b04520a3ab69a94f63f3f1d6716864c07300.zip | |
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/video/ir-kbd-i2c.c')
| -rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 3 |
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) */ 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; @@ -413,7 +412,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; |