Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 100f7f2a authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8370): gspca: Webcam 0461:0821 added. 



Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1ff1e484

drivers/media/video/gspca/sonixb.c

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 


#include "gspca.h"



#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 1, 7)

static const char version[] = "2.1.7";

#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 1, 8)

static const char version[] = "2.1.8";



MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");

MODULE_DESCRIPTION("GSPCA/SN9C102 USB Camera Driver");

drivers/media/video/gspca/sunplus.c

+10 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include "gspca.h"

#include "jpeg.h"



#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 1, 7)

static const char version[] = "2.1.7";

#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 1, 8)

static const char version[] = "2.1.8";



MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");

MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver");
@@ -825,6 +825,13 @@ static int sd_config(struct gspca_dev *gspca_dev, 
/*		case 0x7006: */

			sd->bridge = BRIDGE_SPCA504B;

/*			break; */

/*		} */

		break;

	case 0x0461:		/* MicroInnovation */

/*		switch (product) { */

/*		case 0x0821: */

			sd->bridge = BRIDGE_SPCA533;

/*			break; */

/*		} */

		break;

	case 0x046d:		/* Logitech Labtec */
@@ -1579,6 +1586,7 @@ static const __devinitdata struct usb_device_id device_table[] = { 
	{USB_DEVICE(0x041e, 0x4012), DVNM("PC-Cam350")},

	{USB_DEVICE(0x041e, 0x4013), DVNM("Creative Pccam750")},

	{USB_DEVICE(0x0458, 0x7006), DVNM("Genius Dsc 1.3 Smart")},

	{USB_DEVICE(0x0461, 0x0821), DVNM("Fujifilm MV-1")},

	{USB_DEVICE(0x046d, 0x0905), DVNM("Logitech ClickSmart 820")},

	{USB_DEVICE(0x046d, 0x0960), DVNM("Logitech ClickSmart 420")},

	{USB_DEVICE(0x0471, 0x0322), DVNM("Philips DMVC1300K")},