Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / asm-sparc64 / scatterlist.h

diff --git a/include/asm-sparc64/scatterlist.h b/include/asm-sparc64/scatterlist.h
index 048fdb40e81dc17a1d319222556344aaf5408b2c..81bd058f9382e50bd9e257d50296d604a5e94cf3 100644 (file)
--- a/include/asm-sparc64/scatterlist.h
+++ b/include/asm-sparc64/scatterlist.h
@@ -1,4 +1,3 @@
-/* $Id: scatterlist.h,v 1.11 2001/12/17 07:05:15 davem Exp $ */
 #ifndef _SPARC64_SCATTERLIST_H
 #define _SPARC64_SCATTERLIST_H
 
@@ -6,7 +5,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;
@@ -20,4 +22,6 @@ struct scatterlist {
 
 #define ISA_DMA_THRESHOLD      (~0UL)
 
+#define ARCH_HAS_SG_CHAIN
+
 #endif /* !(_SPARC64_SCATTERLIST_H) */