diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-04 14:23:40 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-04 14:23:40 +0000 |
| commit | dcb90726549eea6b843bc9813a84aecb974258a1 (patch) | |
| tree | 1f8d33428921a01bee0b4fbeb320d10e11b64be0 /linux | |
| parent | 21ba85cb3bf57653bfb793d6fe00e81e0831fae4 (diff) | |
| download | mediapointer-dvb-s2-dcb90726549eea6b843bc9813a84aecb974258a1.tar.gz mediapointer-dvb-s2-dcb90726549eea6b843bc9813a84aecb974258a1.tar.bz2 | |
kernel-sync:
- 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>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/Makefile | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/Makefile | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 8 |
4 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index acae02084..3ac465992 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ obj-$(CONFIG_VIDEO_CX88) += cx88/ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ +obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ obj-$(CONFIG_VIDEO_MXB) += saa7111.o tuner.o tda9840.o tea6415c.o tea6420.o mxb.o obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o diff --git a/linux/drivers/media/video/em28xx/Makefile b/linux/drivers/media/video/em28xx/Makefile index a5ea678b8..da457a05b 100644 --- a/linux/drivers/media/video/em28xx/Makefile +++ b/linux/drivers/media/video/em28xx/Makefile @@ -2,6 +2,5 @@ em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ em28xx-input.o obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o -obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o EXTRA_CFLAGS += -I$(src)/.. diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 2b373799a..1bc651269 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -27,6 +27,7 @@ #include <linux/kernel.h> #include <linux/usb.h> #include <linux/i2c.h> +#include <linux/version.h> #include <linux/video_decoder.h> #include "em28xx.h" diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index 2e910c3ac..e6405386c 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-i2c.c,v 1.24 2005/10/18 14:16:40 mchehab Exp $ + * $Id: ir-kbd-i2c.c,v 1.25 2005/11/04 14:23:40 mchehab Exp $ * * keyboard input driver for i2c IR remote controls * @@ -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) |