diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-22 00:22:12 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-22 00:22:12 -0800 |
| commit | b2555b877bf9faf7045ae362ca051590e79167cf (patch) | |
| tree | a4dfbc40f93be0c2668bbe51541c8a26f16f44dd | |
| parent | 5046e385b4426e229a6beb4bce480762af91a6fc (diff) | |
| parent | e909c682d04e55e77a3c9d158e7dc36027195493 (diff) | |
| download | linux-3.10-b2555b877bf9faf7045ae362ca051590e79167cf.tar.gz linux-3.10-b2555b877bf9faf7045ae362ca051590e79167cf.tar.bz2 linux-3.10-b2555b877bf9faf7045ae362ca051590e79167cf.zip | |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer:
ARM i.MX fixes for -rc.
This contains a single compilation fix for the CODA driver.
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
[media] coda: Fix build due to iram.h rename
| -rw-r--r-- | arch/arm/mach-imx/iram_alloc.c | 3 | ||||
| -rw-r--r-- | drivers/media/platform/coda.c | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/imx-iram.h (renamed from arch/arm/mach-imx/iram.h) | 0 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c index 6c80424f678..e05cf407db6 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 1cf8293c0fb..4a980e029ca 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 index 022690c3370..022690c3370 100644 --- a/arch/arm/mach-imx/iram.h +++ b/include/linux/platform_data/imx-iram.h |