aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:38:37 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:29 -0500
commitb296fc6017e0ec6bc6cd0f40275f268035eb6b8b (patch)
treece2b956c3bdd9e730bcddd4f03372a56131cd365 /drivers/media/video/ir-kbd-i2c.c
parentad07d93ae7884a72a293eb4efb61a872f109ebd5 (diff)
[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.c6
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)
373 373
374 static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1}; 374 static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
375 static const int probe_saa7134[] = { 0x7a, 0x47, -1 }; 375 static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
376 static const int probe_em2820[] = { 0x30, 0x47, -1 }; 376 static const int probe_em28XX[] = { 0x30, 0x47, -1 };
377 const int *probe = NULL; 377 const int *probe = NULL;
378 struct i2c_client c; 378 struct i2c_client c;
379 unsigned char buf; 379 unsigned char buf;
@@ -386,8 +386,8 @@ static int ir_probe(struct i2c_adapter *adap)
386 case I2C_HW_SAA7134: 386 case I2C_HW_SAA7134:
387 probe = probe_saa7134; 387 probe = probe_saa7134;
388 break; 388 break;
389 case I2C_HW_B_EM2820: 389 case I2C_HW_B_EM28XX:
390 probe = probe_em2820; 390 probe = probe_em28XX;
391 break; 391 break;
392 } 392 }
393 if (NULL == probe) 393 if (NULL == probe)