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 /arch/arm/mach-imx/iram_alloc.c | |
| parent | 5046e385b4426e229a6beb4bce480762af91a6fc (diff) | |
| parent | e909c682d04e55e77a3c9d158e7dc36027195493 (diff) | |
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
Diffstat (limited to 'arch/arm/mach-imx/iram_alloc.c')
| -rw-r--r-- | arch/arm/mach-imx/iram_alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c index 6c80424f678e..e05cf407db65 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; |