summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/scatterlist.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /include/asm-m68k/scatterlist.h
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'include/asm-m68k/scatterlist.h')
-rw-r--r--include/asm-m68k/scatterlist.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-m68k/scatterlist.h b/include/asm-m68k/scatterlist.h
index 885ca6146..08691d653 100644
--- a/include/asm-m68k/scatterlist.h
+++ b/include/asm-m68k/scatterlist.h
@@ -6,6 +6,14 @@ struct scatterlist {
char * alt_address; /* Location of actual if address is a
* dma indirect buffer. NULL otherwise */
unsigned int length;
+ unsigned long dvma_address;
+};
+
+struct mmu_sglist {
+ char *addr;
+ char *__dont_touch;
+ unsigned int len;
+ unsigned long dvma_addr;
};
/* This is bogus and should go away. */