Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6-omap-h63xx.git] / include / asm-x86 / scatterlist_64.h

diff --git a/include/asm-x86/scatterlist_64.h b/include/asm-x86/scatterlist_64.h
index ef3986ba4b7909ba91805cfa341b3f4690262e0f..1847c72befeb9aca69a3402c6a243c001b728c20 100644 (file)
--- a/include/asm-x86/scatterlist_64.h
+++ b/include/asm-x86/scatterlist_64.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;
     unsigned int       length;
     dma_addr_t         dma_address;