From af2d0700fb31993be702722e2c35edf681b44b8d Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Wed, 26 May 2010 14:44:35 -0700
Subject: [PATCH] --- yaml --- r: 198847 b: refs/heads/master c:
 16b3f4d65344878cff76306ed2630fa25c0ad5a7 h: refs/heads/master i:   198845:
 b62a5add6895df2fa7c4271566967375c04277c9   198843:
 df34c2e2f0dae207f45f113bf08f1339401a9164   198839:
 2e210396faf2962519ca5d7775479101be542b0d   198831:
 30af8ce87173766f3290631f0273ec89673c2d16   198815:
 89aa64a4c2fcc52a859ba8e90ed6f8b24f093f27   198783:
 33c2bbbfc4734f0b0010c00a4b8e3a28341a36c8 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/cris/include/asm/scatterlist.h | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 4b963aaeb191..1bc8ef214931 100644
--- 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
index faff53ad1f96..249a7842ff5f 100644
--- 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)