diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:01:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:01:57 -0300 |
| commit | bb0211fef21b5bdaeac73958b01dd55c848e7528 (patch) | |
| tree | 9019f6b354ea0684560e40992272fc2cdea1f978 /linux/drivers/media/video/uvc/uvc_driver.c | |
| parent | 6ac3002c45d81596d94c48fedcdb200010793c23 (diff) | |
| parent | d6db2f85c6d097e28ed29d23316c671db5539892 (diff) | |
| download | mediapointer-dvb-s2-bb0211fef21b5bdaeac73958b01dd55c848e7528.tar.gz mediapointer-dvb-s2-bb0211fef21b5bdaeac73958b01dd55c848e7528.tar.bz2 | |
merge: http://linuxtv.org/hg/~pb/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_driver.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_driver.c | 4 |
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, }, |