---

yaml --- r: 139961 b: refs/heads/master c: 375d1c7 h: refs/heads/master i: 139959: a1cd24f v: v3
git-mirror · Mar 24, 2009 · 4560e1b · 4560e1b
1 parent 074b503
commit 4560e1b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 50 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54cae79e52d6a72faa3d6993dcaba560bfac8db3
+refs/heads/master: 375d1c7e2d56603406a72c67229734c61ebc6735
diff --git a/trunk/arch/m68k/include/asm/scatterlist.h b/trunk/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) */
diff --git a/trunk/arch/m68k/include/asm/scatterlist_mm.h b/trunk/arch/m68k/include/asm/scatterlist_mm.h
diff --git a/trunk/arch/m68k/include/asm/scatterlist_no.h b/trunk/arch/m68k/include/asm/scatterlist_no.h