diff options
author | Greg Ungerer <gerg@uclinux.org> | 2009-01-29 16:05:35 +1000 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-03-24 15:17:42 +1000 |
commit | 375d1c7e2d56603406a72c67229734c61ebc6735 (patch) | |
tree | 09c3e64fec152002fe17ade487aa4f7eb8b4da60 /arch/m68k/include/asm/scatterlist_no.h | |
parent | m68k: merge the mmu and non-mmu versions of mmu.h (diff) | |
download | linux-dev-375d1c7e2d56603406a72c67229734c61ebc6735.tar.xz linux-dev-375d1c7e2d56603406a72c67229734c61ebc6735.zip |
m68k: use mmu scatterlist.h for non-mmu setups as well
There is only trivial differences between the non-mmu and mmu
versions of scatterlist.h. So use the mmu one and remove the non-mmu one.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/scatterlist_no.h')
-rw-r--r-- | arch/m68k/include/asm/scatterlist_no.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/m68k/include/asm/scatterlist_no.h b/arch/m68k/include/asm/scatterlist_no.h deleted file mode 100644 index afc4788b0d2c..000000000000 --- a/arch/m68k/include/asm/scatterlist_no.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _M68KNOMMU_SCATTERLIST_H -#define _M68KNOMMU_SCATTERLIST_H - -#include <linux/mm.h> -#include <asm/types.h> - -struct scatterlist { -#ifdef CONFIG_DEBUG_SG - unsigned long sg_magic; -#endif - unsigned long page_link; - unsigned int offset; - dma_addr_t dma_address; - unsigned int length; -}; - -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->length) - -#define ISA_DMA_THRESHOLD (0xffffffff) - -#endif /* !(_M68KNOMMU_SCATTERLIST_H) */ |