diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-17 08:41:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:27:32 -0400 |
commit | 100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c (patch) | |
tree | eadb16993d204ad6fad6c877d8664c885a7b4e5b /drivers/media/video | |
parent | 1ff1e48442188b9ae68aef82b66baef89e988cf6 (diff) |
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/media/video')
-rw-r--r-- | drivers/media/video/gspca/sonixb.c | 4 | ||||
-rw-r--r-- | drivers/media/video/gspca/sunplus.c | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c index f1b16d4451f2..7099c3770b3e 100644 --- a/drivers/media/video/gspca/sonixb.c +++ b/drivers/media/video/gspca/sonixb.c | |||
@@ -24,8 +24,8 @@ | |||
24 | 24 | ||
25 | #include "gspca.h" | 25 | #include "gspca.h" |
26 | 26 | ||
27 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 7) | 27 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 8) |
28 | static const char version[] = "2.1.7"; | 28 | static const char version[] = "2.1.8"; |
29 | 29 | ||
30 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); | 30 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); |
31 | MODULE_DESCRIPTION("GSPCA/SN9C102 USB Camera Driver"); | 31 | MODULE_DESCRIPTION("GSPCA/SN9C102 USB Camera Driver"); |
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c index acd4a077198a..7fa280d731a3 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/video/gspca/sunplus.c | |||
@@ -24,8 +24,8 @@ | |||
24 | #include "gspca.h" | 24 | #include "gspca.h" |
25 | #include "jpeg.h" | 25 | #include "jpeg.h" |
26 | 26 | ||
27 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 7) | 27 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 8) |
28 | static const char version[] = "2.1.7"; | 28 | static const char version[] = "2.1.8"; |
29 | 29 | ||
30 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); | 30 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); |
31 | MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver"); | 31 | MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver"); |
@@ -827,6 +827,13 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
827 | /* break; */ | 827 | /* break; */ |
828 | /* } */ | 828 | /* } */ |
829 | break; | 829 | break; |
830 | case 0x0461: /* MicroInnovation */ | ||
831 | /* switch (product) { */ | ||
832 | /* case 0x0821: */ | ||
833 | sd->bridge = BRIDGE_SPCA533; | ||
834 | /* break; */ | ||
835 | /* } */ | ||
836 | break; | ||
830 | case 0x046d: /* Logitech Labtec */ | 837 | case 0x046d: /* Logitech Labtec */ |
831 | switch (product) { | 838 | switch (product) { |
832 | case 0x0905: | 839 | case 0x0905: |
@@ -1579,6 +1586,7 @@ static const __devinitdata struct usb_device_id device_table[] = { | |||
1579 | {USB_DEVICE(0x041e, 0x4012), DVNM("PC-Cam350")}, | 1586 | {USB_DEVICE(0x041e, 0x4012), DVNM("PC-Cam350")}, |
1580 | {USB_DEVICE(0x041e, 0x4013), DVNM("Creative Pccam750")}, | 1587 | {USB_DEVICE(0x041e, 0x4013), DVNM("Creative Pccam750")}, |
1581 | {USB_DEVICE(0x0458, 0x7006), DVNM("Genius Dsc 1.3 Smart")}, | 1588 | {USB_DEVICE(0x0458, 0x7006), DVNM("Genius Dsc 1.3 Smart")}, |
1589 | {USB_DEVICE(0x0461, 0x0821), DVNM("Fujifilm MV-1")}, | ||
1582 | {USB_DEVICE(0x046d, 0x0905), DVNM("Logitech ClickSmart 820")}, | 1590 | {USB_DEVICE(0x046d, 0x0905), DVNM("Logitech ClickSmart 820")}, |
1583 | {USB_DEVICE(0x046d, 0x0960), DVNM("Logitech ClickSmart 420")}, | 1591 | {USB_DEVICE(0x046d, 0x0960), DVNM("Logitech ClickSmart 420")}, |
1584 | {USB_DEVICE(0x0471, 0x0322), DVNM("Philips DMVC1300K")}, | 1592 | {USB_DEVICE(0x0471, 0x0322), DVNM("Philips DMVC1300K")}, |