diff --git a/[refs] b/[refs]
index b55db355f408..285d162afd33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ef2d7477549c85b84b24b155baa798650cbf90b
+refs/heads/master: a6d468d05356655cdc11bb2cfec4e64bcef6ad0a
diff --git a/trunk/arch/sparc/include/asm/scatterlist.h b/trunk/arch/sparc/include/asm/scatterlist.h
index e580f5581c88..d1120257b033 100644
--- a/trunk/arch/sparc/include/asm/scatterlist.h
+++ b/trunk/arch/sparc/include/asm/scatterlist.h
@@ -1,27 +1,8 @@
 #ifndef _SPARC_SCATTERLIST_H
 #define _SPARC_SCATTERLIST_H
 
-#include <asm/page.h>
-#include <asm/types.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-	unsigned long	sg_magic;
-#endif
-	unsigned long	page_link;
-	unsigned int	offset;
-
-	unsigned int	length;
-
-	dma_addr_t	dma_address;
-	__u32		dma_length;
-};
-
-#define sg_dma_address(sg)	((sg)->dma_address)
 #define sg_dma_len(sg)     	((sg)->dma_length)
 
-#define ISA_DMA_THRESHOLD	(~0UL)
-
-#define ARCH_HAS_SG_CHAIN
+#include <asm-generic/scatterlist.h>
 
 #endif /* !(_SPARC_SCATTERLIST_H) */