Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-arm / scatterlist.h

diff --git a/include/asm-arm/scatterlist.h b/include/asm-arm/scatterlist.h
index d9c056c..de2f65e 100644 (file)
--- a/include/asm-arm/scatterlist.h
+++ b/include/asm-arm/scatterlist.h
@@ -1,6 +1,7 @@
 #ifndef _ASMARM_SCATTERLIST_H
 #define _ASMARM_SCATTERLIST_H
 
+#include <asm/memory.h>
 #include <asm/types.h>
 
 struct scatterlist {
@@ -8,7 +9,6 @@ struct scatterlist {
        unsigned int    offset;         /* buffer offset                 */
        dma_addr_t      dma_address;    /* dma address                   */
        unsigned int    length;         /* length                        */
-       char            *__address;     /* for set_dma_addr              */
 };
 
 /*
@@ -21,6 +21,4 @@ struct scatterlist {
 #define sg_dma_address(sg)      ((sg)->dma_address)
 #define sg_dma_len(sg)          ((sg)->length)
 
-#define ISA_DMA_THRESHOLD (0xffffffff)
-
 #endif /* _ASMARM_SCATTERLIST_H */