Em Mon, 7 Jan 2013 13:46:05 -0200 Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> escreveu: > Em Mon, 7 Jan 2013 08:16:02 -0200 > Fabio Estevam <festevam@xxxxxxxxx> escreveu: > > > Hi Sascha, ... > > It would be better to use git mv /git format-patch -M, so that git can > > detect the file rename. > > Agreed. Anyway, I applied here and did a git show -M: > > From: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > Date: Mon, 7 Jan 2013 11:03:45 +0100 > Subject: [PATCH] coda: Fix build due to iram.h rename > > 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/platform_data/imx-iram.h instead. This is an intermediate solution > until the i.MX iram allocator is converted to the generic SRAM allocator. > > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Patch looks OK on my eyes. Acked-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> > > diff --git a/arch/arm/mach-imx/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c > index 6c80424..e05cf40 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/platform_data/imx-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 2721f83..16a243d 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/platform_data/imx-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/platform_data/imx-iram.h > similarity index 100% > rename from arch/arm/mach-imx/iram.h > rename to include/linux/platform_data/imx-iram.h Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
