summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/scatterlist_mm.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-01-29 16:05:35 +1000
committerGreg Ungerer <gerg@uclinux.org>2009-03-24 15:17:42 +1000
commit375d1c7e2d56603406a72c67229734c61ebc6735 (patch)
tree09c3e64fec152002fe17ade487aa4f7eb8b4da60 /arch/m68k/include/asm/scatterlist_mm.h
parent54cae79e52d6a72faa3d6993dcaba560bfac8db3 (diff)
downloadlinux-375d1c7e2d56603406a72c67229734c61ebc6735.tar.gz
linux-375d1c7e2d56603406a72c67229734c61ebc6735.tar.bz2
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_mm.h')
-rw-r--r--arch/m68k/include/asm/scatterlist_mm.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/m68k/include/asm/scatterlist_mm.h b/arch/m68k/include/asm/scatterlist_mm.h
deleted file mode 100644
index d3a7a0edfeca..000000000000
--- a/arch/m68k/include/asm/scatterlist_mm.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#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) */