aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chen <jason.chen@linaro.org>2011-12-05 18:42:55 +0800
committerJason Chen <jason.chen@linaro.org>2011-12-06 12:46:21 +0800
commit200f1969367a4e0d4a0e75cc035aff1d0b7dc52c (patch)
tree3f80f5779f20ed30626c32b36ec7523bf332f577
parent25dc489bb6828e807d09e53e5e162030c82a6f3c (diff)
downloadlinux-linaro-200f1969367a4e0d4a0e75cc035aff1d0b7dc52c.tar.gz
imx6q-sabrelite: fix init_consistent_dma_size build error
Signed-off-by: Jason Chen <jason.chen@linaro.org>
-rw-r--r--arch/arm/mach-imx/mach-imx6q.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index a8602c0058a..af79cfc17db 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -16,7 +16,7 @@
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/hardware/gic.h>
#include <asm/mach/arch.h>
@@ -25,6 +25,7 @@
#include <mach/hardware.h>
#include <mach/ipu-v3.h>
#include <mach/iomux-mx6q.h>
+
static iomux_v3_cfg_t mx6q_sabr_pads[] = {
/* DISPLAY */
MX6Q_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK,
@@ -124,7 +125,7 @@ static void __init imx6q_map_io(void)
imx_scu_map_io();
imx6q_clock_map_io();
- init_consistent_dma_size(SZ_64MB);
+ init_consistent_dma_size(SZ_64M);
}
static void __init imx6q_gpio_add_irq_domain(struct device_node *np,