From 6c8941ebda8ab456f282e3238a101f261285bdae Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Date: Sat, 8 Nov 2008 18:47:28 -0300
Subject: [PATCH] --- yaml --- r: 124163 b: refs/heads/master c:
 562f0fed97722fc58230d21e401f1259caa94b4c h: refs/heads/master i:   124161:
 da2035dbe653fe1bb046275d071634388dea4a52   124159:
 f3ab620f97dcb258ab299c2d96a11f96ea0fe268 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/uvc/uvc_driver.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b713dd489afa..27631ab019f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c44d81dbb5fa29842ce73fdb5c647fda657082b
+refs/heads/master: 562f0fed97722fc58230d21e401f1259caa94b4c
diff --git a/trunk/drivers/media/video/uvc/uvc_driver.c b/trunk/drivers/media/video/uvc/uvc_driver.c
index d7ad060640bc..66970ec6e8c0 100644
--- a/trunk/drivers/media/video/uvc/uvc_driver.c
+++ b/trunk/drivers/media/video/uvc/uvc_driver.c
@@ -1837,6 +1837,15 @@ static struct usb_device_id uvc_ids[] = {
 	  .bInterfaceSubClass	= 1,
 	  .bInterfaceProtocol	= 0,
 	  .driver_info		= UVC_QUIRK_STREAM_NO_FID },
+	/* Syntek (Samsung Q310) */
+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
+				| USB_DEVICE_ID_MATCH_INT_INFO,
+	  .idVendor		= 0x174f,
+	  .idProduct		= 0x5931,
+	  .bInterfaceClass	= USB_CLASS_VIDEO,
+	  .bInterfaceSubClass	= 1,
+	  .bInterfaceProtocol	= 0,
+	  .driver_info		= UVC_QUIRK_STREAM_NO_FID },
 	/* Asus F9SG */
 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 				| USB_DEVICE_ID_MATCH_INT_INFO,