---

yaml --- r: 198847 b: refs/heads/master c: 16b3f4d h: refs/heads/master i: 198845: b62a5ad 198843: df34c2e 198839: 2e21039 198831: 30af8ce 198815: 89aa64a 198783: 33c2bbb v: v3
git-mirror · May 27, 2010 · af2d070 · af2d070
1 parent 4665c21
commit af2d070
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81a791907e69146575e4463d2eb98cf17f55fdb1
+refs/heads/master: 16b3f4d65344878cff76306ed2630fa25c0ad5a7
diff --git a/trunk/arch/cris/include/asm/scatterlist.h b/trunk/arch/cris/include/asm/scatterlist.h
@@ -1,22 +1,7 @@
 #ifndef __ASM_CRIS_SCATTERLIST_H
 #define __ASM_CRIS_SCATTERLIST_H
 
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-	unsigned long sg_magic;
-#endif
-	char *  address;    /* Location data is to be transferred to */
-	unsigned int length;
-
-	/* The following is i386 highmem junk - not used by us */
-	unsigned long page_link;
-	unsigned int offset;/* for highmem, page offset */
-
-};
-
-#define sg_dma_address(sg)	((sg)->address)
-#define sg_dma_len(sg)		((sg)->length)
-/* i386 junk */
+#include <asm-generic/scatterlist.h>
 
 #define ISA_DMA_THRESHOLD (0x1fffffff)