diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
| commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
| tree | d498e947176f4b77938034ff6c6427f9875da721 /arch/m68k/include/asm/scatterlist_no.h | |
| parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff) | |
| parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,m68knommu: merge header files
Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'arch/m68k/include/asm/scatterlist_no.h')
| -rw-r--r-- | arch/m68k/include/asm/scatterlist_no.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/scatterlist_no.h b/arch/m68k/include/asm/scatterlist_no.h new file mode 100644 index 00000000000..afc4788b0d2 --- /dev/null +++ b/arch/m68k/include/asm/scatterlist_no.h @@ -0,0 +1,22 @@ +#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) */ |