Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[mv-sheeva.git] / include / asm-h8300 / scatterlist.h

diff --git a/include/asm-h8300/scatterlist.h b/include/asm-h8300/scatterlist.h
index 985fdf54eacad5c49d39f5082b9807456f18603b..d3ecdd87ac90b0ca8642d6d38886f6afc14a56fe 100644 (file)
--- a/include/asm-h8300/scatterlist.h
+++ b/include/asm-h8300/scatterlist.h
@@ -4,7 +4,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;