diff options
| author | Greg Ungerer | 2009-01-29 07:05:35 +0100 |
|---|---|---|
| committer | Greg Ungerer | 2009-03-24 06:17:42 +0100 |
| commit | 375d1c7e2d56603406a72c67229734c61ebc6735 (patch) | |
| tree | 09c3e64fec152002fe17ade487aa4f7eb8b4da60 /arch/m68k/include/asm/scatterlist.h | |
| parent | m68k: merge the mmu and non-mmu versions of mmu.h (diff) | |
| download | kernel-qcow2-linux-375d1c7e2d56603406a72c67229734c61ebc6735.tar.gz kernel-qcow2-linux-375d1c7e2d56603406a72c67229734c61ebc6735.tar.xz kernel-qcow2-linux-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.h')
| -rw-r--r-- | arch/m68k/include/asm/scatterlist.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h index b7e528636252..d3a7a0edfeca 100644 --- a/arch/m68k/include/asm/scatterlist.h +++ b/arch/m68k/include/asm/scatterlist.h @@ -1,5 +1,23 @@ -#ifdef __uClinux__ -#include "scatterlist_no.h" -#else -#include "scatterlist_mm.h" +#ifndef _M68K_SCATTERLIST_H +#define _M68K_SCATTERLIST_H + +#include <linux/types.h> + +struct scatterlist { +#ifdef CONFIG_DEBUG_SG + unsigned long sg_magic; #endif + unsigned long page_link; + unsigned int offset; + unsigned int length; + + __u32 dma_address; /* A place to hang host-specific addresses at. */ +}; + +/* This is bogus and should go away. */ +#define ISA_DMA_THRESHOLD (0x00ffffff) + +#define sg_dma_address(sg) ((sg)->dma_address) +#define sg_dma_len(sg) ((sg)->length) + +#endif /* !(_M68K_SCATTERLIST_H) */ |