Merge git://git.infradead.org/battery-2.6

[~andy/linux] / include / asm-sparc / scatterlist.h

diff --git a/include/asm-sparc/scatterlist.h b/include/asm-sparc/scatterlist.h
index 4055af90ad7e45ad92430d1cf6df03aa1e13c2ec..e08d3d775b08aff2fa7029aa592744cc78ed5ad4 100644 (file)
--- a/include/asm-sparc/scatterlist.h
+++ b/include/asm-sparc/scatterlist.h
@@ -5,7 +5,10 @@
 #include <linux/types.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;