Merge commit 'origin/master'

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

diff --git a/include/asm-avr32/scatterlist.h b/include/asm-avr32/scatterlist.h
index 1356f29d89f5b01c006f6496113c4821205372b4..377320e3bd1741b19d7c5acdc2ad2de78502ae6a 100644 (file)
--- a/include/asm-avr32/scatterlist.h
+++ b/include/asm-avr32/scatterlist.h
@@ -4,6 +4,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;