Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/include/asm-m68knommu/scatterlist.h b/include/asm-m68knommu/scatterlist.h
index 4da79d3d3f34d03f07c7b34529f4e30502e2e3bf..10942840e88fcb030a3f3216930b6aa5c8b3d6c9 100644 (file)
--- a/include/asm-m68knommu/scatterlist.h
+++ b/include/asm-m68knommu/scatterlist.h
@@ -5,7 +5,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;