summaryrefslogtreecommitdiffstats
path: root/arch/cris/include/asm/dma-mapping.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-05-01 12:46:15 +0200
committerJens Axboe <axboe@fb.com>2015-05-05 21:35:39 +0200
commit84be456f883c4685680fba8e5154b5f72e92957e (patch)
tree1b83cb63af91f9e0ab42739cff9819591e089eac /arch/cris/include/asm/dma-mapping.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)
downloadlinux-84be456f883c4685680fba8e5154b5f72e92957e.tar.xz
linux-84be456f883c4685680fba8e5154b5f72e92957e.zip
remove <asm/scatterlist.h>
We don't have any arch specific scatterlist now that parisc switched over to the generic one. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'arch/cris/include/asm/dma-mapping.h')
-rw-r--r--arch/cris/include/asm/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/include/asm/dma-mapping.h b/arch/cris/include/asm/dma-mapping.h
index 2f0f654f1b44..57f794ee6039 100644
--- a/arch/cris/include/asm/dma-mapping.h
+++ b/arch/cris/include/asm/dma-mapping.h
@@ -5,10 +5,10 @@
#include <linux/mm.h>
#include <linux/kernel.h>
+#include <linux/scatterlist.h>
#include <asm/cache.h>
#include <asm/io.h>
-#include <asm/scatterlist.h>
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)