summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/dma-nommu.c
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2011-12-14 12:11:13 +0100
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-03-28 16:36:37 +0200
commit552c0d3ea68df46646d1f0dfcbf92a133c4e792b (patch)
tree0a4dfd51f7ddcd7e9353c6855aa6435da70f9439 /arch/sh/kernel/dma-nommu.c
parent4ce9a91f344d08640ea6e9a6eba0c1b4641ab6a1 (diff)
downloadlinux-552c0d3ea68df46646d1f0dfcbf92a133c4e792b.tar.gz
linux-552c0d3ea68df46646d1f0dfcbf92a133c4e792b.tar.xz
SH: adapt for dma_map_ops changes
Adapt core SH architecture code for dma_map_ops changes: replace alloc/free_coherent with generic alloc/free methods. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/dma-nommu.c')
-rw-r--r--arch/sh/kernel/dma-nommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c
index 3c55b87f8b63..5b0bfcda6d0b 100644
--- a/arch/sh/kernel/dma-nommu.c
+++ b/arch/sh/kernel/dma-nommu.c
@@ -63,8 +63,8 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,
#endif
struct dma_map_ops nommu_dma_ops = {
- .alloc_coherent = dma_generic_alloc_coherent,
- .free_coherent = dma_generic_free_coherent,
+ .alloc = dma_generic_alloc_coherent,
+ .free = dma_generic_free_coherent,
.map_page = nommu_map_page,
.map_sg = nommu_map_sg,
#ifdef CONFIG_DMA_NONCOHERENT