Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[mv-sheeva.git] / include / asm-s390 / scatterlist.h

diff --git a/include/asm-s390/scatterlist.h b/include/asm-s390/scatterlist.h
index a43b3afc5e2da6bc919290f692bb44e50db9b44a..29ec8e28c8df375f1aa13e12b9edf2fa89752831 100644 (file)
--- a/include/asm-s390/scatterlist.h
+++ b/include/asm-s390/scatterlist.h
@@ -2,7 +2,10 @@
 #define _ASMS390_SCATTERLIST_H
 
 struct scatterlist {
-    struct page *page;
+#ifdef CONFIG_DEBUG_SG
+    unsigned long sg_magic;
+#endif
+    unsigned long page_link;
     unsigned int offset;
     unsigned int length;
 };