From bf1905d2b0d39ac058292cc2ac544614361a1365 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 29 Mar 2008 03:08:08 +0000
Subject: [PATCH] --- yaml --- r: 87923 b: refs/heads/master c:
 53a0c98e117272125183138aefc6b13b4a5f38a1 h: refs/heads/master i:   87921:
 87877648d7f9c51bcfc648178f77835a51e0328b   87919:
 ab45a127d7acfb3d61327096f667c980197450c5 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/dma/ioat_dca.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e5cda291fee7..52d4e9e3bcab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cf83b9b1279dbcdbcf91522bf766c998270ec44
+refs/heads/master: 53a0c98e117272125183138aefc6b13b4a5f38a1
diff --git a/trunk/drivers/dma/ioat_dca.c b/trunk/drivers/dma/ioat_dca.c
index 0fa8a98051a8..9e922760b7ff 100644
--- a/trunk/drivers/dma/ioat_dca.c
+++ b/trunk/drivers/dma/ioat_dca.c
@@ -98,7 +98,7 @@ struct ioat_dca_slot {
 
 struct ioat_dca_priv {
 	void __iomem		*iobase;
-	void			*dca_base;
+	void __iomem		*dca_base;
 	int			 max_requesters;
 	int			 requester_count;
 	u8			 tag_map[IOAT_TAG_MAP_LEN];
@@ -338,7 +338,7 @@ static struct dca_ops ioat2_dca_ops = {
 	.get_tag		= ioat2_dca_get_tag,
 };
 
-static int ioat2_dca_count_dca_slots(void *iobase, u16 dca_offset)
+static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset)
 {
 	int slots = 0;
 	u32 req;