From patchwork Wed Nov 14 13:04:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 15447 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TYcec-00053S-Uf for patchwork@linuxtv.org; Wed, 14 Nov 2012 14:05:18 +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-4) with esmtp for id 1TYcec-0005un-Ae; Wed, 14 Nov 2012 14:05:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422868Ab2KNNE4 (ORCPT ); Wed, 14 Nov 2012 08:04:56 -0500 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:20803 "EHLO tx2outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422855Ab2KNNEy (ORCPT ); Wed, 14 Nov 2012 08:04:54 -0500 Received: from mail260-tx2-R.bigfish.com (10.9.14.239) by TX2EHSOBE014.bigfish.com (10.9.40.34) with Microsoft SMTP Server id 14.1.225.23; Wed, 14 Nov 2012 13:04:53 +0000 Received: from mail260-tx2 (localhost [127.0.0.1]) by mail260-tx2-R.bigfish.com (Postfix) with ESMTP id 894CDE40241; Wed, 14 Nov 2012 13:04:53 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h1155h) Received: from mail260-tx2 (localhost.localdomain [127.0.0.1]) by mail260-tx2 (MessageSwitch) id 1352898291752015_31516; Wed, 14 Nov 2012 13:04:51 +0000 (UTC) Received: from TX2EHSMHS044.bigfish.com (unknown [10.9.14.243]) by mail260-tx2.bigfish.com (Postfix) with ESMTP id B4E1C1580049; Wed, 14 Nov 2012 13:04:51 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS044.bigfish.com (10.9.99.144) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 14 Nov 2012 13:04:50 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.318.3; Wed, 14 Nov 2012 13:04:50 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.240.141]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id qAED4i4t028473; Wed, 14 Nov 2012 06:04:45 -0700 From: Fabio Estevam To: CC: , , , , , Fabio Estevam Subject: [PATCH] [media] coda: Fix build due to iram.h rename Date: Wed, 14 Nov 2012 11:04:42 -0200 Message-ID: <1352898282-21576-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com 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.11.14.125725 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 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_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' commit c045e3f13 (ARM: imx: include iram.h rather than mach/iram.h) changed the location of iram.h, which causes the following build error when building the coda driver: drivers/media/platform/coda.c:27:23: error: mach/iram.h: No such file or directory drivers/media/platform/coda.c: In function 'coda_probe': drivers/media/platform/coda.c:2000: error: implicit declaration of function 'iram_alloc' drivers/media/platform/coda.c:2001: warning: assignment makes pointer from integer without a cast drivers/media/platform/coda.c: In function 'coda_remove': drivers/media/platform/coda.c:2024: error: implicit declaration of function 'iram_free Since the content of iram.h is not imx specific, move it to include/linux/iram.h instead. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/iram_alloc.c | 3 +-- drivers/media/platform/coda.c | 2 +- {arch/arm/mach-imx => include/linux}/iram.h | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename {arch/arm/mach-imx => include/linux}/iram.h (100%) diff --git a/arch/arm/mach-imx/iram.h b/include/linux/iram.h similarity index 100% rename from arch/arm/mach-imx/iram.h rename to include/linux/iram.h diff --git a/arch/arm/mach-imx/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c index 6c80424..11e067f 100644 --- a/arch/arm/mach-imx/iram_alloc.c +++ b/arch/arm/mach-imx/iram_alloc.c @@ -22,8 +22,7 @@ #include #include #include - -#include "iram.h" +#include static unsigned long iram_phys_base; static void __iomem *iram_virt_base; diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index cd04ae2..5c66162 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -23,8 +23,8 @@ #include #include #include +#include -#include #include #include #include