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

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

diff --git a/include/asm-blackfin/scatterlist.h b/include/asm-blackfin/scatterlist.h
index 60e07b92044cdda56ec6834eba26d30f2f153f80..32128d53469b0ba73c519cdba16098c55a0d9cf2 100644 (file)
--- a/include/asm-blackfin/scatterlist.h
+++ b/include/asm-blackfin/scatterlist.h
@@ -4,7 +4,10 @@
 #include <linux/mm.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;