summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Stehlé <vincent.stehle@laposte.net>2014-06-19 11:31:10 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-06-23 09:15:58 +0900
commit14a5e926141f9c37bdaa0220169489e782220ee1 (patch)
treea1effe73aaf346cad1a9ffdda9d542a9eeeb2d45
parentecdaca48629bd99609fdc612685363330967dce2 (diff)
downloadblackbird-obmc-linux-14a5e926141f9c37bdaa0220169489e782220ee1.tar.gz
blackbird-obmc-linux-14a5e926141f9c37bdaa0220169489e782220ee1.zip
ARM: shmobile: rcar-gen2: update call to dma_contiguous_reserve_area
Commit 5ea3b1b2f8ad 'cma: add placement specifier for "cma=" kernel parameter' adds a new 'fixed' parameter to dma_contiguous_reserve_area(). Update rcar_gen2_reserve() accordingly. This fixes the following compilation error: arch/arm/mach-shmobile/setup-rcar-gen2.c: In function ‘rcar_gen2_reserve’: arch/arm/mach-shmobile/setup-rcar-gen2.c:182:10: error: too few arguments to function ‘dma_contiguous_reserve_area’ Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/setup-rcar-gen2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 73fb2a659d9f..42d5b4308923 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -179,6 +179,6 @@ void __init rcar_gen2_reserve(void)
#ifdef CONFIG_DMA_CMA
if (mrc.size)
dma_contiguous_reserve_area(mrc.size, mrc.base, 0,
- &rcar_gen2_dma_contiguous);
+ &rcar_gen2_dma_contiguous, true);
#endif
}
OpenPOWER on IntegriCloud