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 45b16f1072be2ac530087d4ce30336378239833c..e08d3d775b08aff2fa7029aa592744cc78ed5ad4 100644 (file)
--- a/include/asm-sparc/scatterlist.h
+++ b/include/asm-sparc/scatterlist.h
@@ -5,6 +5,9 @@
 #include <linux/types.h>
 
 struct scatterlist {
+#ifdef CONFIG_DEBUG_SG
+       unsigned long sg_magic;
+#endif
        unsigned long page_link;
        unsigned int offset;