Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

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

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