summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-17 09:41:03 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 07:27:32 -0300
commit100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c (patch)
treeeadb16993d204ad6fad6c877d8664c885a7b4e5b /drivers
parent1ff1e48442188b9ae68aef82b66baef89e988cf6 (diff)
downloadop-kernel-dev-100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c.zip
op-kernel-dev-100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c.tar.gz
V4L/DVB (8370): gspca: Webcam 0461:0821 added.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/sonixb.c4
-rw-r--r--drivers/media/video/gspca/sunplus.c12
2 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index f1b16d4..7099c37 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -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");
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index acd4a07..7fa280d 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -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");
@@ -827,6 +827,13 @@ static int sd_config(struct gspca_dev *gspca_dev,
/* break; */
/* } */
break;
+ case 0x0461: /* MicroInnovation */
+/* switch (product) { */
+/* case 0x0821: */
+ sd->bridge = BRIDGE_SPCA533;
+/* break; */
+/* } */
+ break;
case 0x046d: /* Logitech Labtec */
switch (product) {
case 0x0905:
@@ -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")},
OpenPOWER on IntegriCloud