[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>

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 123c0a6ed20354955841c2bf4fc3f0c971af36f7..351ce5be2ad45e07672b7d03662463a190ec6c79 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -40,6 +40,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/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
index a5ea678b8c2948bbd178ebe1d79dfd669c0d4c91..da457a05b0dd4a9a68af9804ab883924254c287d 100644 (file)
--- 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 \
                   em28xx-input.o
 
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o
-obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o
 
 EXTRA_CFLAGS += -I$(src)/..

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 5b09f52dd669f7fab37c0b37c49ee33f1b9c5a9f..54f21242ccbf2c585af8aff284678486d176ee9d 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/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/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index bdb3ba55136041ef01f0173d3e53585b4f78f8cc..0085567a1421d3fb5c06b145b0c302ec96a05895 100644 (file)
--- 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)