aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/gspca.txt2
-rw-r--r--drivers/media/video/gspca/sunplus.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 24f55a0cc027..0c4880af57a3 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -46,6 +46,7 @@ sonixj 045e:00f5 MicroSoft VX3000
46sonixj 045e:00f7 MicroSoft VX1000 46sonixj 045e:00f7 MicroSoft VX1000
47ov519 045e:028c Micro$oft xbox cam 47ov519 045e:028c Micro$oft xbox cam
48spca508 0461:0815 Micro Innovation IC200 48spca508 0461:0815 Micro Innovation IC200
49sunplus 0461:0821 Fujifilm MV-1
49zc3xx 0461:0a00 MicroInnovation WebCam320 50zc3xx 0461:0a00 MicroInnovation WebCam320
50spca500 046d:0890 Logitech QuickCam traveler 51spca500 046d:0890 Logitech QuickCam traveler
51vc032x 046d:0892 Logitech Orbicam 52vc032x 046d:0892 Logitech Orbicam
@@ -169,6 +170,7 @@ sunplus 08ca:2024 Aiptek DV3500 Mpeg4
169sunplus 08ca:2028 Aiptek PocketCam4M 170sunplus 08ca:2028 Aiptek PocketCam4M
170sunplus 08ca:2040 Aiptek PocketDV4100M 171sunplus 08ca:2040 Aiptek PocketDV4100M
171sunplus 08ca:2042 Aiptek PocketDV5100 172sunplus 08ca:2042 Aiptek PocketDV5100
173sunplus 08ca:2050 Medion MD 41437
172sunplus 08ca:2060 Aiptek PocketDV5300 174sunplus 08ca:2060 Aiptek PocketDV5300
173tv8532 0923:010f ICM532 cams 175tv8532 0923:010f ICM532 cams
174mars 093a:050f Mars-Semi Pc-Camera 176mars 093a:050f Mars-Semi Pc-Camera
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 7fa280d731a3..abd7bef9b3d1 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -1008,6 +1008,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
1008 break; 1008 break;
1009 case 0x2040: 1009 case 0x2040:
1010 case 0x2042: 1010 case 0x2042:
1011 case 0x2050:
1011 case 0x2060: 1012 case 0x2060:
1012 sd->bridge = BRIDGE_SPCA536; 1013 sd->bridge = BRIDGE_SPCA536;
1013 break; 1014 break;
@@ -1636,6 +1637,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
1636 {USB_DEVICE(0x08ca, 0x2028), DVNM("Aiptek PocketCam4M")}, 1637 {USB_DEVICE(0x08ca, 0x2028), DVNM("Aiptek PocketCam4M")},
1637 {USB_DEVICE(0x08ca, 0x2040), DVNM("Aiptek PocketDV4100M")}, 1638 {USB_DEVICE(0x08ca, 0x2040), DVNM("Aiptek PocketDV4100M")},
1638 {USB_DEVICE(0x08ca, 0x2042), DVNM("Aiptek PocketDV5100")}, 1639 {USB_DEVICE(0x08ca, 0x2042), DVNM("Aiptek PocketDV5100")},
1640 {USB_DEVICE(0x08ca, 0x2050), DVNM("Medion MD 41437")},
1639 {USB_DEVICE(0x08ca, 0x2060), DVNM("Aiptek PocketDV5300")}, 1641 {USB_DEVICE(0x08ca, 0x2060), DVNM("Aiptek PocketDV5300")},
1640 {USB_DEVICE(0x0d64, 0x0303), DVNM("Sunplus FashionCam DXG")}, 1642 {USB_DEVICE(0x0d64, 0x0303), DVNM("Sunplus FashionCam DXG")},
1641 {} 1643 {}