diff --git a/[refs] b/[refs]
index f0accc448176..ce1c75cde3c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a48223f9449d0289fc20cd11a98758109830798e
+refs/heads/master: 204f3a04449a9a775e465f7d87bcab08f170e59e
diff --git a/trunk/arch/microblaze/include/asm/scatterlist.h b/trunk/arch/microblaze/include/asm/scatterlist.h
index 35d786fe93ae..be44d94cba54 100644
--- a/trunk/arch/microblaze/include/asm/scatterlist.h
+++ b/trunk/arch/microblaze/include/asm/scatterlist.h
@@ -1 +1,3 @@
+#define ISA_DMA_THRESHOLD	(~0UL)
+
 #include <asm-generic/scatterlist.h>
diff --git a/trunk/arch/s390/include/asm/scatterlist.h b/trunk/arch/s390/include/asm/scatterlist.h
index 35d786fe93ae..be44d94cba54 100644
--- a/trunk/arch/s390/include/asm/scatterlist.h
+++ b/trunk/arch/s390/include/asm/scatterlist.h
@@ -1 +1,3 @@
+#define ISA_DMA_THRESHOLD	(~0UL)
+
 #include <asm-generic/scatterlist.h>
diff --git a/trunk/arch/score/include/asm/scatterlist.h b/trunk/arch/score/include/asm/scatterlist.h
index 9f533b8362c7..4fa1a6658215 100644
--- a/trunk/arch/score/include/asm/scatterlist.h
+++ b/trunk/arch/score/include/asm/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_SCORE_SCATTERLIST_H
 #define _ASM_SCORE_SCATTERLIST_H
 
+#define ISA_DMA_THRESHOLD	(~0UL)
+
 #include <asm-generic/scatterlist.h>
 
 #endif /* _ASM_SCORE_SCATTERLIST_H */
diff --git a/trunk/arch/sparc/include/asm/scatterlist.h b/trunk/arch/sparc/include/asm/scatterlist.h
index d1120257b033..0fa0d6da2107 100644
--- a/trunk/arch/sparc/include/asm/scatterlist.h
+++ b/trunk/arch/sparc/include/asm/scatterlist.h
@@ -3,6 +3,8 @@
 
 #define sg_dma_len(sg)     	((sg)->dma_length)
 
+#define ISA_DMA_THRESHOLD	(~0UL)
+
 #include <asm-generic/scatterlist.h>
 
 #endif /* !(_SPARC_SCATTERLIST_H) */
diff --git a/trunk/include/asm-generic/scatterlist.h b/trunk/include/asm-generic/scatterlist.h
index 8b9454496a7c..51a7a43ab0ce 100644
--- a/trunk/include/asm-generic/scatterlist.h
+++ b/trunk/include/asm-generic/scatterlist.h
@@ -34,10 +34,6 @@ struct scatterlist {
 #endif /* 64 bit */
 #endif /* sg_dma_len */
 
-#ifndef ISA_DMA_THRESHOLD
-#define ISA_DMA_THRESHOLD	(~0UL)
-#endif
-
 #define ARCH_HAS_SG_CHAIN
 
 #endif /* __ASM_GENERIC_SCATTERLIST_H */