From patchwork Sat Jul 30 15:47:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Dietsche X-Patchwork-Id: 1022492 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6UFn9E7021441 for ; Sat, 30 Jul 2011 15:49:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810Ab1G3Pp7 (ORCPT ); Sat, 30 Jul 2011 11:45:59 -0400 Received: from que21.charter.net ([209.225.8.22]:48398 "EHLO que21.charter.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751419Ab1G3Pp6 (ORCPT ); Sat, 30 Jul 2011 11:45:58 -0400 Received: from imp11 ([10.20.200.11]) by mta21.charter.net (InterMail vM.7.09.02.04 201-2219-117-106-20090629) with ESMTP id <20110730154435.RWTR3880.mta21.charter.net@imp11>; Sat, 30 Jul 2011 11:44:35 -0400 Received: from www.farmergreg.com ([96.42.32.177]) by imp11 with smtp.charter.net id EFka1h0083pHlLY05Fkadr; Sat, 30 Jul 2011 11:44:35 -0400 X-Authority-Analysis: v=1.1 cv=9p7SjTZeSDUoepfMOc4Nsety+m2Qz47GaesuhdPPf9o= c=1 sm=1 a=Y-Xa6sjusHoA:10 a=lDGNyK2vIvEA:10 a=xzrYXqw+0zwiO4gHSXHcAg==:17 a=ywb5jiRdAAAA:8 a=FKcYwT7qAAAA:8 a=q3bFVz8phfM1WQm4WMgA:9 a=hO6-NAvlA-CbkXu3u3YA:7 a=8ayuLyWxgakA:10 a=xzrYXqw+0zwiO4gHSXHcAg==:117 Received: from red.farmergreg.com ([10.0.0.50]) by www.farmergreg.com with esmtp (Exim 4.72) (envelope-from ) id 1QnBm9-0004wY-6G; Sat, 30 Jul 2011 10:48:29 -0500 Received: from greg by red.farmergreg.com with local (Exim 4.72) (envelope-from ) id 1QnBmA-0005b9-6C; Sat, 30 Jul 2011 10:48:30 -0500 From: Greg Dietsche To: laurent.pinchart@ideasonboard.com Cc: mchehab@infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, trivial@kernel.org, jpiszcz@lucidpixels.com, Greg Dietsche Subject: [PATCH] uvcvideo: correct kernel version reference Date: Sat, 30 Jul 2011 10:47:30 -0500 Message-Id: <1312040850-21475-1-git-send-email-Gregory.Dietsche@cuw.edu> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 30 Jul 2011 15:49:09 +0000 (UTC) change from v2.6.42 to v3.2 Reported-by: Justin Piszcz Signed-off-by: Greg Dietsche --- 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."