diff --git a/[refs] b/[refs]
index 136ed81b9740..abb45ea0e252 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94f17cd7887ca681ea88fda1fd9bf65c0ca161f0
+refs/heads/master: ed1d218c95c6846416ddb39085b20a5b3c0872e4
diff --git a/trunk/drivers/base/dma-coherent.c b/trunk/drivers/base/dma-coherent.c
index d4d8ce53886a..f369e2795985 100644
--- a/trunk/drivers/base/dma-coherent.c
+++ b/trunk/drivers/base/dma-coherent.c
@@ -8,7 +8,7 @@
 
 struct dma_coherent_mem {
 	void		*virt_base;
-	u32		device_base;
+	dma_addr_t	device_base;
 	int		size;
 	int		flags;
 	unsigned long	*bitmap;