From: Fabio Estevam <fabio.estevam@freescale.com>
To: <mchehab@infradead.org>
Cc: <kernel@pengutronix.de>, <p.zabel@pengutronix.de>,
<javier.martin@vista-silicon.com>, <linux-media@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: [PATCH] [media] coda: Fix build due to iram.h rename
Date: Wed, 14 Nov 2012 11:04:42 -0200 [thread overview]
Message-ID: <1352898282-21576-1-git-send-email-fabio.estevam@freescale.com> (raw)
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 <fabio.estevam@freescale.com>
---
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_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 <linux/module.h>
#include <linux/spinlock.h>
#include <linux/genalloc.h>
-
-#include "iram.h"
+#include <linux/iram.h>
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 <linux/slab.h>
#include <linux/videodev2.h>
#include <linux/of.h>
+#include <linux/iram.h>
-#include <mach/iram.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
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
--
1.7.9.5
next reply other threads:[~2012-11-14 13:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 13:04 Fabio Estevam [this message]
2012-12-17 9:37 ` Sascha Hauer
2012-12-27 22:15 ` Mauro Carvalho Chehab
2013-01-02 11:29 ` Sascha Hauer
2013-01-07 10:03 Sascha Hauer
2013-01-07 10:16 ` Fabio Estevam
2013-01-07 13:21 ` Uwe Kleine-König
2013-01-07 15:46 ` Mauro Carvalho Chehab
2013-01-07 15:48 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352898282-21576-1-git-send-email-fabio.estevam@freescale.com \
--to=fabio.estevam@freescale.com \
--cc=javier.martin@vista-silicon.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=p.zabel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®