From patchwork Mon Nov  9 01:44:57 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andy Walls <awalls@radix.net>
X-Patchwork-Id: 58645
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA91gsfh014945
	for <patchwork-media@patchwork.kernel.org>;
	Mon, 9 Nov 2009 01:42:54 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752081AbZKIBmq (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Sun, 8 Nov 2009 20:42:46 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751739AbZKIBmq
	(ORCPT <rfc822;linux-media-outgoing>);
	Sun, 8 Nov 2009 20:42:46 -0500
Received: from mail1.radix.net ([207.192.128.31]:57599 "EHLO mail1.radix.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751406AbZKIBmp (ORCPT <rfc822;linux-media@vger.kernel.org>);
	Sun, 8 Nov 2009 20:42:45 -0500
Received: from [192.168.1.2] (01-174.155.popsite.net [66.217.131.174])
	(authenticated bits=0)
	by mail1.radix.net (8.13.4/8.13.4) with ESMTP id nA91giGT017101;
	Sun, 8 Nov 2009 20:42:45 -0500 (EST)
Subject: [PATCH] v4l/scripts: Fix make checkpatch operation with in tree
	checkpatch.pl
From: Andy Walls <awalls@radix.net>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-media@vger.kernel.org
Date: Sun, 08 Nov 2009 20:44:57 -0500
Message-Id: <1257731097.6504.4.camel@palomino.walls.org>
Mime-Version: 1.0
X-Mailer: Evolution 2.24.5 (2.24.5-2.fc10) 
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org


diff -r d2aaff136907 v4l/scripts/check.pl
--- a/v4l/scripts/check.pl	Thu Nov 05 19:51:24 2009 -0500
+++ b/v4l/scripts/check.pl	Sun Nov 08 20:40:06 2009 -0500
@@ -56,11 +56,13 @@
 }
 close IN;
 
-my $intree_checkpatch = "scripts/checkpatch.pl --no-tree --strict";
+my $intree_checkpatch = "scripts/checkpatch.pl --version ";
 if (!open IN,"$intree_checkpatch|") {
 	$intree_checkpatch = "v4l/".$intree_checkpatch;
 	open IN,"$intree_checkpatch|";
 }
+$intree_checkpatch =~ s/--version/--no-tree --strict/;
+
 while (<IN>) {
 	tr/A-Z/a-z/;
 	if (m/version\s*:\s*([\d\.]+)/) {