diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-05-01 12:46:15 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-05-05 21:35:39 +0200 |
| commit | 84be456f883c4685680fba8e5154b5f72e92957e (patch) | |
| tree | 1b83cb63af91f9e0ab42739cff9819591e089eac /arch/frv/include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| download | linux-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/frv/include')
| -rw-r--r-- | arch/frv/include/asm/dma-mapping.h | 2 | ||||
| -rw-r--r-- | arch/frv/include/asm/pci.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/include/asm/dma-mapping.h b/arch/frv/include/asm/dma-mapping.h index 1746a2b8e6e7..2840adcd6d92 100644 --- a/arch/frv/include/asm/dma-mapping.h +++ b/arch/frv/include/asm/dma-mapping.h @@ -2,9 +2,9 @@ #define _ASM_DMA_MAPPING_H #include <linux/device.h> +#include <linux/scatterlist.h> #include <asm/cache.h> #include <asm/cacheflush.h> -#include <asm/scatterlist.h> #include <asm/io.h> /* diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h index 2035a4d3f9b9..43d224685144 100644 --- a/arch/frv/include/asm/pci.h +++ b/arch/frv/include/asm/pci.h @@ -14,7 +14,7 @@ #define _ASM_FRV_PCI_H #include <linux/mm.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci.h> |