Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release

[firefly-linux-kernel-4.4.55.git] / include / asm-avr32 / scatterlist.h

diff --git a/include/asm-avr32/scatterlist.h b/include/asm-avr32/scatterlist.h
index bfe7d753423cbed4e476010a0b3b6a72dfde36e2..377320e3bd1741b19d7c5acdc2ad2de78502ae6a 100644 (file)
--- a/include/asm-avr32/scatterlist.h
+++ b/include/asm-avr32/scatterlist.h
@@ -1,8 +1,13 @@
 #ifndef __ASM_AVR32_SCATTERLIST_H
 #define __ASM_AVR32_SCATTERLIST_H
 
+#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;