[kernel/f16] Add C600 ID to the Logitech USB patch

[Josh Boyer]

commit b6ba0deffa1d89ae4ce31aae9eba2eb489de2520
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Oct 13 15:51:57 2011 -0400

    Add C600 ID to the Logitech USB patch

 kernel.spec                              |    3 +++
 usb-add-quirk-for-logitech-webcams.patch |   18 +++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 09bf264..89149b2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2067,6 +2067,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 13 2011 Josh Boyer <jwboyer at redhat.com>
+- Update usb-add-quirk-for-logitech-webcams.patch with C600 ID (rhbz 742010)
+
 * Thu Oct 13 2011 Adam Jackson <ajax at redhat.com>
 - drm/i915: Treat SDVO LVDS as digital when parsing EDID (#729882)
 
diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch
index 9a932ca..052a27e 100644
--- a/usb-add-quirk-for-logitech-webcams.patch
+++ b/usb-add-quirk-for-logitech-webcams.patch
@@ -1,4 +1,4 @@
-From 48ff94510ecf6b36c793c40ae3d15ce39a331e17 Mon Sep 17 00:00:00 2001
+From d5446509abd85b6845d91a319a033c5bd17e494d Mon Sep 17 00:00:00 2001
 From: Oliver Neukum <oneukum-l3A5Bk7waGM at public.gmane.org>
 Date: Tue, 13 Sep 2011 08:42:21 +0200
 Subject: [PATCH] USB:add RESET_RESUME for webcams shown to be quirky
@@ -20,15 +20,16 @@ usbcore with the RESET_RESUME quirk.
 Signed-off-by: Oliver Neukum <oneukum-l3A5Bk7waGM at public.gmane.org>
 
 Add C300 ID from patch in rhbz #742010
+Add C600 ID from rhbz #742010
 ---
- drivers/usb/core/quirks.c |   24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
+ drivers/usb/core/quirks.c |   27 +++++++++++++++++++++++++++
+ 1 files changed, 27 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 81ce6a8..d6a8d82 100644
+index 81ce6a8..caa1991 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
-@@ -38,6 +38,27 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -38,6 +38,30 @@ static const struct usb_device_id usb_quirk_list[] = {
  	/* Creative SB Audigy 2 NX */
  	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
  
@@ -44,6 +45,9 @@ index 81ce6a8..d6a8d82 100644
 +	/* Logitech Webcam B/C500 */
 +	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
 +
++	/* Logitech Webcam C600 */
++	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
++
 +	/* Logitech Webcam Pro 9000 */
 +	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
 +
@@ -56,7 +60,7 @@ index 81ce6a8..d6a8d82 100644
  	/* Logitech Harmony 700-series */
  	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
  
-@@ -69,6 +90,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -69,6 +93,9 @@ static const struct usb_device_id usb_quirk_list[] = {
  	{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
  			USB_QUIRK_CONFIG_INTF_STRINGS },
  
@@ -67,5 +71,5 @@ index 81ce6a8..d6a8d82 100644
  	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
  
 -- 
-1.7.6
+1.7.6.4