From patchwork Tue May 8 08:42:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 11106 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SRg0o-0003oQ-5U for patchwork@linuxtv.org; Tue, 08 May 2012 10:43:14 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1SRg0n-0000h5-A5; Tue, 08 May 2012 10:43:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751159Ab2EHInB (ORCPT ); Tue, 8 May 2012 04:43:01 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:34935 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975Ab2EHInA (ORCPT ); Tue, 8 May 2012 04:43:00 -0400 Received: by wgbds11 with SMTP id ds11so347239wgb.1 for ; Tue, 08 May 2012 01:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=bJ8Fi8L0+7KVBqXYHJ9HaseFo2nrlau5japWha7Wp/s=; b=CzgCn018selpW+GF8qmXfxmQWJftp4fCtsrfc/OvmLkj4gdey+Zywi3pRbm3L6STzT loVMCGp3n+aXri/U0eT0Wa87+qfBjp3R9uAwlyFoNgN+qYgJPY29saUcTMfmYbVVC0XA qNzP3WRqdisR6f9vcWxLkwIlP+47fzsgghAQKNvb/XMwBU/0d9J7fRTWJ851HFNOtIjW WXGB5Z1/sx3Wi+KIS2+XpA9dkkkiwD9tximjKowg88q8KdVcV3MDs4NtU79xeE7LyMVb OLo/4rewo6aNvDrSGuK8SFbDz5C7EKziNPjvy57AikE5tyoh3LIpZha7L3zlTNb6n/C1 jK+A== Received: by 10.180.95.37 with SMTP id dh5mr42543849wib.8.1336466579071; Tue, 08 May 2012 01:42:59 -0700 (PDT) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPS id k6sm27787200wiy.7.2012.05.08.01.42.56 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 May 2012 01:42:58 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, mchehab@redhat.com Cc: hans.verkuil@cisco.com, Gianluca Gennari Subject: [PATCH] media_build: fix backport patches removing et61x251 hunks Date: Tue, 8 May 2012 10:42:49 +0200 Message-Id: <1336466569-32529-1-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.8.83016 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' The old et61x251 driver has been removed: http://git.linuxtv.org/media_tree.git/commit/04ef052419ac61f28c6b7eafbe5d8e82c02bbee2 so let's delete the related hunks from the media_build backport patches. Signed-off-by: Gianluca Gennari --- backports/api_version.patch | 6 ------ backports/pr_fmt.patch | 24 ------------------------ 2 files changed, 0 insertions(+), 30 deletions(-) diff --git a/backports/api_version.patch b/backports/api_version.patch index 147221c..9bd9348 100644 --- a/backports/api_version.patch +++ b/backports/api_version.patch @@ -1,9 +1,3 @@ -diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c ---- a/drivers/media/video/et61x251/et61x251_core.c -+++ b/drivers/media/video/et61x251/et61x251_core.c -@@ -1582,1 +1582,1 @@ et61x251_vidioc_querycap(struct et61x251 -- .version = LINUX_VERSION_CODE, -+ .version = V4L2_VERSION, diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c diff --git a/backports/pr_fmt.patch b/backports/pr_fmt.patch index e6db18e..5561d6f 100644 --- a/backports/pr_fmt.patch +++ b/backports/pr_fmt.patch @@ -322,30 +322,6 @@ index ffd8bc7..c38d97d 100644 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include "cx25821-video.h" -diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c -index 5539f09..8cdf5b6 100644 ---- a/drivers/media/video/et61x251/et61x251_core.c -+++ b/drivers/media/video/et61x251/et61x251_core.c -@@ -18,6 +18,7 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - ***************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff --git a/drivers/media/video/et61x251/et61x251_tas5130d1b.c b/drivers/media/video/et61x251/et61x251_tas5130d1b.c -index ced2e16..3977c93 100644 ---- a/drivers/media/video/et61x251/et61x251_tas5130d1b.c -+++ b/drivers/media/video/et61x251/et61x251_tas5130d1b.c -@@ -19,6 +19,7 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - ***************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "et61x251_sensor.h" diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c index 9769f17..e9b1052 100644 --- a/drivers/media/video/gspca/benq.c