diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
| commit | a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf (patch) | |
| tree | f24c9da1c1927f290aa3d1b640d7fa272860520d /linux-2.6-uvc-autosuspend.patch | |
| parent | ee99a68c51ebd08409e45b63796f3c971c27e3d6 (diff) | |
| parent | 98e6119f39d3b83af3b533bed6bcff0e096f2397 (diff) | |
| download | kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.gz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.xz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.zip | |
Merge branch 'kernel-git' strategy 'theirs'
Conflicts:
xhci_hcd-suspend-resume.patch
Diffstat (limited to 'linux-2.6-uvc-autosuspend.patch')
| -rw-r--r-- | linux-2.6-uvc-autosuspend.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/linux-2.6-uvc-autosuspend.patch b/linux-2.6-uvc-autosuspend.patch deleted file mode 100644 index 6c965c62f..000000000 --- a/linux-2.6-uvc-autosuspend.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 4a3757e0ae269f710292dd75013532c5a57ccb00 -Author: Matthew Garrett <mjg@redhat.com> -Date: Thu Sep 16 13:38:38 2010 -0400 - - uvc: Enable USB autosuspend by default on uvcvideo - - We've been doing this for a while in Fedora without any complaints. - - Signed-off-by: Matthew Garrett <mjg@redhat.com> - -diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c -index 8bdd940..28ed5b4 100644 ---- a/drivers/media/video/uvc/uvc_driver.c -+++ b/drivers/media/video/uvc/uvc_driver.c -@@ -1814,6 +1814,7 @@ static int uvc_probe(struct usb_interface *intf, - } - - uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n"); -+ usb_enable_autosuspend(udev); - return 0; - - error: |