diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-11-09 00:38:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:29 -0500 |
commit | b296fc6017e0ec6bc6cd0f40275f268035eb6b8b (patch) | |
tree | ce2b956c3bdd9e730bcddd4f03372a56131cd365 /drivers/media | |
parent | ad07d93ae7884a72a293eb4efb61a872f109ebd5 (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')
-rw-r--r-- | drivers/media/video/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/video/em28xx/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 1 | ||||
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 6 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 123c0a6ed203..351ce5be2ad4 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -40,6 +40,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o | |||
40 | obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ | 40 | obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ |
41 | obj-$(CONFIG_VIDEO_CX88) += cx88/ | 41 | obj-$(CONFIG_VIDEO_CX88) += cx88/ |
42 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ | 42 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ |
43 | obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o | ||
43 | obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ | 44 | obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ |
44 | obj-$(CONFIG_VIDEO_MXB) += saa7111.o tuner.o tda9840.o tea6415c.o tea6420.o mxb.o | 45 | obj-$(CONFIG_VIDEO_MXB) += saa7111.o tuner.o tda9840.o tea6415c.o tea6420.o mxb.o |
45 | obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o | 46 | obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o |
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile index a5ea678b8c29..da457a05b0dd 100644 --- a/drivers/media/video/em28xx/Makefile +++ b/drivers/media/video/em28xx/Makefile | |||
@@ -2,6 +2,5 @@ em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ | |||
2 | em28xx-input.o | 2 | em28xx-input.o |
3 | 3 | ||
4 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o | 4 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o |
5 | obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o | ||
6 | 5 | ||
7 | EXTRA_CFLAGS += -I$(src)/.. | 6 | EXTRA_CFLAGS += -I$(src)/.. |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 5b09f52dd669..54f21242ccbf 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
28 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/version.h> | ||
30 | #include <linux/video_decoder.h> | 31 | #include <linux/video_decoder.h> |
31 | 32 | ||
32 | #include "em28xx.h" | 33 | #include "em28xx.h" |
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) |