summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/uvc/uvc_driver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_driver.c b/linux/drivers/media/video/uvc/uvc_driver.c
index 4ab4d1ebb..b2482502a 100644
--- a/linux/drivers/media/video/uvc/uvc_driver.c
+++ b/linux/drivers/media/video/uvc/uvc_driver.c
@@ -1692,10 +1692,12 @@ static int uvc_resume(struct usb_interface *intf)
return __uvc_resume(intf, 0);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
static int uvc_reset_resume(struct usb_interface *intf)
{
return __uvc_resume(intf, 1);
}
+#endif
/* ------------------------------------------------------------------------
* Driver initialization and cleanup
@@ -1971,7 +1973,9 @@ struct uvc_driver uvc_driver = {
.disconnect = uvc_disconnect,
.suspend = uvc_suspend,
.resume = uvc_resume,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
.reset_resume = uvc_reset_resume,
+#endif
.id_table = uvc_ids,
.supports_autosuspend = 1,
},