diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-05-01 12:46:15 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-05-05 13:35:39 -0600 |
| commit | 84be456f883c4685680fba8e5154b5f72e92957e (patch) | |
| tree | 1b83cb63af91f9e0ab42739cff9819591e089eac /arch/cris | |
| parent | d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8 (diff) | |
| download | talos-obmc-linux-84be456f883c4685680fba8e5154b5f72e92957e.tar.gz talos-obmc-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')
| -rw-r--r-- | arch/cris/include/asm/dma-mapping.h | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/pci.h | 2 |
2 files changed, 2 insertions, 2 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) diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h index cc2399c175e9..c15b4b4baafa 100644 --- a/arch/cris/include/asm/pci.h +++ b/arch/cris/include/asm/pci.h @@ -29,7 +29,7 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); #include <linux/types.h> #include <linux/slab.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/string.h> #include <asm/io.h> |
