Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[karo-tx-linux.git] / include / asm-xtensa / scatterlist.h

diff --git a/include/asm-xtensa/scatterlist.h b/include/asm-xtensa/scatterlist.h
index 3b8aba5d2c68254b2d81717f6ae6169c7d9be9a2..810080bb0a2b2cfa498c39fed32c11d2897763bd 100644 (file)
--- a/include/asm-xtensa/scatterlist.h
+++ b/include/asm-xtensa/scatterlist.h
@@ -14,6 +14,9 @@
 #include <asm/types.h>
 
 struct scatterlist {
+#ifdef CONFIG_DEBUG_SG
+       unsigned long   sg_magic;
+#endif
        unsigned long   page_link;
        unsigned int    offset;
        dma_addr_t      dma_address;