From b89d9971c36b88663b924c779c75638f2e81ff62 Mon Sep 17 00:00:00 2001
From: Arne Caspari <arne@unicap-imaging.org>
Date: Sat, 30 Jul 2011 08:29:11 -0300
Subject: [PATCH] --- yaml --- r: 271887 b: refs/heads/master c:
 fd3e9f2f9a4c46f5d67d384c78b2d364c99d3de6 h: refs/heads/master i:   271885:
 447839e431d53d7858ac33703640bfaab8726e63   271883:
 2330e905e1ae99977f0ba2d3984bcb8bf7f1528a   271879:
 ec56d0a35f43c9158239d41c888b097cbe8a36f6   271871:
 ccf9a98a8cbbb49efdc583fbae045b244025f890 v: v3

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

diff --git a/[refs] b/[refs]
index cd9e0ceb0d0f..682b1c1b09f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 547d42eac107f027e6101b828f9e4075f2fbcc7c
+refs/heads/master: fd3e9f2f9a4c46f5d67d384c78b2d364c99d3de6
diff --git a/trunk/drivers/media/video/uvc/uvc_driver.c b/trunk/drivers/media/video/uvc/uvc_driver.c
index e4100b1f68df..a3c24dd875fc 100644
--- a/trunk/drivers/media/video/uvc/uvc_driver.c
+++ b/trunk/drivers/media/video/uvc/uvc_driver.c
@@ -2331,6 +2331,14 @@ static struct usb_device_id uvc_ids[] = {
 	  .bInterfaceSubClass	= 1,
 	  .bInterfaceProtocol	= 0,
 	  .driver_info		= UVC_QUIRK_PROBE_DEF },
+	/* The Imaging Source USB CCD cameras */
+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
+				| USB_DEVICE_ID_MATCH_INT_INFO,
+	  .idVendor		= 0x199e,
+	  .idProduct		= 0x8102,
+	  .bInterfaceClass	= USB_CLASS_VENDOR_SPEC,
+	  .bInterfaceSubClass	= 1,
+	  .bInterfaceProtocol	= 0 },
 	/* Bodelin ProScopeHR */
 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 				| USB_DEVICE_ID_MATCH_DEV_HI