diff --git a/[refs] b/[refs]
index e94007e13ab2..f425a0b8b463 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 606333d64e06db9ae14b5a025380bc5954b1a6c4
+refs/heads/master: 15ee04c288d8d612d93a14decc968e817d21e789
diff --git a/trunk/arch/m68k/include/asm/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist.h
index d3a7a0edfeca..e27ad902b1cf 100644
--- a/trunk/arch/m68k/include/asm/scatterlist.h
+++ b/trunk/arch/m68k/include/asm/scatterlist.h
@@ -11,7 +11,7 @@ struct scatterlist {
 	unsigned int offset;
 	unsigned int length;
 
-	__u32 dma_address;	/* A place to hang host-specific addresses at. */
+	dma_addr_t dma_address;	/* A place to hang host-specific addresses at. */
 };
 
 /* This is bogus and should go away. */