From d1c8a384a371ced38ddafd00c4f20d2bba8c08cc Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 11 Sep 2009 10:29:00 +0200
Subject: [PATCH] --- yaml --- r: 157473 b: refs/heads/master c:
 5dd1d2ece0250125fec2dcccbfb8ab9bb2ac020c h: refs/heads/master i:   157471:
 0494513f7c5e33b8e96e998df4b23cde06aa7c35 v: v3

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

diff --git a/[refs] b/[refs]
index 5f8ee1e0f8f0..f9005ae0861a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f64d04c042193183c6dad98944ae2861b998e8b7
+refs/heads/master: 5dd1d2ece0250125fec2dcccbfb8ab9bb2ac020c
diff --git a/trunk/arch/s390/include/asm/scatterlist.h b/trunk/arch/s390/include/asm/scatterlist.h
index 29ec8e28c8df..35d786fe93ae 100644
--- a/trunk/arch/s390/include/asm/scatterlist.h
+++ b/trunk/arch/s390/include/asm/scatterlist.h
@@ -1,19 +1 @@
-#ifndef _ASMS390_SCATTERLIST_H
-#define _ASMS390_SCATTERLIST_H
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-    unsigned long sg_magic;
-#endif
-    unsigned long page_link;
-    unsigned int offset;
-    unsigned int length;
-};
-
-#ifdef __s390x__
-#define ISA_DMA_THRESHOLD (0xffffffffffffffffUL)
-#else
-#define ISA_DMA_THRESHOLD (0xffffffffUL)
-#endif
-
-#endif /* _ASMS390X_SCATTERLIST_H */
+#include <asm-generic/scatterlist.h>