Commit b296fc60 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ad07d93a

drivers/media/video/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/media/video/em28xx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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)/..

drivers/media/video/em28xx/em28xx-video.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/media/video/ir-kbd-i2c.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE