From patchwork Tue Mar 20 12:00:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 10418 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1S9xjo-0003HS-M2 for patchwork@linuxtv.org; Tue, 20 Mar 2012 13:00:28 +0100 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-2) with esmtp for id 1S9xjn-0001cy-It; Tue, 20 Mar 2012 13:00:28 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759783Ab2CTMAV (ORCPT ); Tue, 20 Mar 2012 08:00:21 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:34592 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757608Ab2CTMAU (ORCPT ); Tue, 20 Mar 2012 08:00:20 -0400 Received: by eaaq12 with SMTP id q12so2960227eaa.19 for ; Tue, 20 Mar 2012 05:00:18 -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=Ecq+D0IwwP0jd2hrSwbIbldaMxaKbVETwnsmlHkvK5c=; b=BjcAy7tFj75ZPewpMsVU66w13VPpWJpIUv4CG35adk58xccmiWGq0Ygx/HqYPxxuAZ O91v6qmKXIfNMTjDqwQALzH0/NLnUFpPTCBMB/QCwWfbSPDQgH5n1xBOejWRETdRT0HP AqLJPyqxxmdUyPcvRKV8VZK1zof1ovDRLHKTlpL+D2zTCe9Cg96KVxBlF3+TGjwB/jvt 1UY/B2s0MbJVk4cim3YRd/4I0cjZ/iKFohkZN9nYZkMUsJ+3raALkp+4qdv6f8Ito9uA ns1iao0cqmEcyIGA6O2WWly5OzpUS/HB0eCruU3BrmtSke9XQCh03dbR/T/7yqXYbLPW u1QQ== Received: by 10.14.98.206 with SMTP id v54mr1946052eef.82.1332244818727; Tue, 20 Mar 2012 05:00:18 -0700 (PDT) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPS id n56sm4548217eeb.4.2012.03.20.05.00.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Mar 2012 05:00:17 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, mchehab@redhat.com Cc: Gianluca Gennari Subject: [PATCH] media_build: add uvc_driver.c to no_atomic_include backport patch Date: Tue, 20 Mar 2012 13:00:10 +0100 Message-Id: <1332244810-14881-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.3.20.115121 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 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, __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 ' This pull request: http://patchwork.linuxtv.org/patch/10122/ and in particular this patch: Andrew Morton (1): uvcvideo: uvc_driver.c: use linux/atomic.h includes the header file linux/atomic.h in file uvc_driver.c, breaking the media_build tree compilation on all kernels up to 3.0. To fix the problem, let's remove the included file adding a new chunk for uvc_driver.c in the existing no_atomic_include.patch backport patch. Tested with kernel 2.6.32. Signed-off-by: Gianluca Gennari --- backports/no_atomic_include.patch | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/backports/no_atomic_include.patch b/backports/no_atomic_include.patch index c14c55d..d063734 100644 --- a/backports/no_atomic_include.patch +++ b/backports/no_atomic_include.patch @@ -16,6 +16,12 @@ index 10c2364..74587fa 100644 +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -23 +22,0 @@ -#include +diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c +index c029535..d143339 100644 +--- a/drivers/media/video/uvc/uvc_driver.c ++++ b/drivers/media/video/uvc/uvc_driver.c +@@ -26 +25,0 @@ +-#include diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c index 677691c..a123a2f 100644 --- a/drivers/media/video/uvc/uvc_queue.c