---

yaml --- r: 104039 b: refs/heads/master c: c91256c h: refs/heads/master i: 104037: 62edae9 104035: 6375d35 104031: 384a061 v: v3
git-mirror · Jul 20, 2008 · 1a7eafd · 1a7eafd
1 parent 3d240f8
commit 1a7eafd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c
+refs/heads/master: c91256c27b9509624df2619271cfca9ec5436f8f
diff --git a/trunk/Documentation/video4linux/gspca.txt b/trunk/Documentation/video4linux/gspca.txt
@@ -46,6 +46,7 @@ sonixj		045e:00f5	MicroSoft VX3000
 sonixj		045e:00f7	MicroSoft VX1000
 ov519		045e:028c	Micro$oft xbox cam
 spca508		0461:0815	Micro Innovation IC200
+sunplus		0461:0821	Fujifilm MV-1
 zc3xx		0461:0a00	MicroInnovation WebCam320
 spca500		046d:0890	Logitech QuickCam traveler
 vc032x		046d:0892	Logitech Orbicam
@@ -169,6 +170,7 @@ sunplus		08ca:2024	Aiptek DV3500 Mpeg4
 sunplus		08ca:2028	Aiptek PocketCam4M
 sunplus		08ca:2040	Aiptek PocketDV4100M
 sunplus		08ca:2042	Aiptek PocketDV5100
+sunplus		08ca:2050	Medion MD 41437
 sunplus		08ca:2060	Aiptek PocketDV5300
 tv8532		0923:010f	ICM532 cams
 mars		093a:050f	Mars-Semi Pc-Camera

diff --git a/trunk/drivers/media/video/gspca/sunplus.c b/trunk/drivers/media/video/gspca/sunplus.c
@@ -1008,6 +1008,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
 			break;
 		case 0x2040:
 		case 0x2042:
+		case 0x2050:
 		case 0x2060:
 			sd->bridge = BRIDGE_SPCA536;
 			break;
@@ -1636,6 +1637,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
 	{USB_DEVICE(0x08ca, 0x2028), DVNM("Aiptek PocketCam4M")},
 	{USB_DEVICE(0x08ca, 0x2040), DVNM("Aiptek PocketDV4100M")},
 	{USB_DEVICE(0x08ca, 0x2042), DVNM("Aiptek PocketDV5100")},
+	{USB_DEVICE(0x08ca, 0x2050), DVNM("Medion MD 41437")},
 	{USB_DEVICE(0x08ca, 0x2060), DVNM("Aiptek PocketDV5300")},
 	{USB_DEVICE(0x0d64, 0x0303), DVNM("Sunplus FashionCam DXG")},
 	{}