Hi Greg, Thanks for the patch. On Saturday 30 July 2011 17:47:30 Greg Dietsche wrote: > change from v2.6.42 to v3.2 This patch would be queued for v3.2. As the code it fixes will go away at the same time, it would be pretty pointless to apply it :-) Thanks for warning me though. > Reported-by: Justin Piszcz <jpiszcz@xxxxxxxxxxxxxxx> > Signed-off-by: Greg Dietsche <Gregory.Dietsche@xxxxxxx> > --- > drivers/media/video/uvc/uvc_v4l2.c | 2 +- > drivers/media/video/uvc/uvcvideo.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/video/uvc/uvc_v4l2.c > b/drivers/media/video/uvc/uvc_v4l2.c index ea71d5f..6d6e3f9 100644 > --- a/drivers/media/video/uvc/uvc_v4l2.c > +++ b/drivers/media/video/uvc/uvc_v4l2.c > @@ -546,7 +546,7 @@ static void uvc_v4l2_ioctl_warn(void) > return; > > uvc_printk(KERN_INFO, "Deprecated UVCIOC_CTRL_{ADD,MAP_OLD,GET,SET} " > - "ioctls will be removed in 2.6.42.\n"); > + "ioctls will be removed in 3.2.\n"); > uvc_printk(KERN_INFO, "See http://www.ideasonboard.org/uvc/upgrade/ " > "for upgrade instructions.\n"); > warned = 1; > diff --git a/drivers/media/video/uvc/uvcvideo.h > b/drivers/media/video/uvc/uvcvideo.h index df32a43..4419c34 100644 > --- a/drivers/media/video/uvc/uvcvideo.h > +++ b/drivers/media/video/uvc/uvcvideo.h > @@ -7,7 +7,7 @@ > #ifndef __KERNEL__ > /* > * This header provides binary compatibility with applications using the > private - * uvcvideo API. This API is deprecated and will be removed in > 2.6.42. + * uvcvideo API. This API is deprecated and will be removed in > 3.2. * Applications should be recompiled against the public > linux/uvcvideo.h header. */ > #warn "The uvcvideo.h header is deprecated, use linux/uvcvideo.h instead." -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html