diff options
| author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-11-09 06:38:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 16:56:29 +0100 |
| commit | b296fc6017e0ec6bc6cd0f40275f268035eb6b8b (patch) | |
| tree | ce2b956c3bdd9e730bcddd4f03372a56131cd365 /drivers/media/video/ir-kbd-i2c.c | |
| parent | [PATCH] v4l: 897: saa7146 fix (diff) | |
| download | linux-b296fc6017e0ec6bc6cd0f40275f268035eb6b8b.tar.xz linux-b296fc6017e0ec6bc6cd0f40275f268035eb6b8b.zip | |
[PATCH] v4l: 898: em2820 i2c fix
- Miscelaneous fixes for em28xx
- I2C hardware named changed to wright value.
- utsname included to em28xx-video.c
- Makefile fixes.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
| -rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index bdb3ba551360..0085567a1421 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c @@ -373,7 +373,7 @@ static int ir_probe(struct i2c_adapter *adap) static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1}; static const int probe_saa7134[] = { 0x7a, 0x47, -1 }; - static const int probe_em2820[] = { 0x30, 0x47, -1 }; + static const int probe_em28XX[] = { 0x30, 0x47, -1 }; const int *probe = NULL; struct i2c_client c; unsigned char buf; @@ -386,8 +386,8 @@ static int ir_probe(struct i2c_adapter *adap) case I2C_HW_SAA7134: probe = probe_saa7134; break; - case I2C_HW_B_EM2820: - probe = probe_em2820; + case I2C_HW_B_EM28XX: + probe = probe_em28XX; break; } if (NULL == probe) |