Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[linux-2.6] / include / asm-m68k / scatterlist.h

diff --git a/include/asm-m68k/scatterlist.h b/include/asm-m68k/scatterlist.h
index e06bb891048ec68c1e228de3afe084fcccfc2c3b..d3a7a0edfecab3d9ad3a04cc3e936cf1ca9faf50 100644 (file)
--- a/include/asm-m68k/scatterlist.h
+++ b/include/asm-m68k/scatterlist.h
@@ -4,6 +4,9 @@
 #include <linux/types.h>
 
 struct scatterlist {
+#ifdef CONFIG_DEBUG_SG
+       unsigned long sg_magic;
+#endif
        unsigned long page_link;
        unsigned int offset;
        unsigned int length;