From 92dac3fe77c6afdfaec8a069eb4184e6ad619b88 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 10 Oct 2006 22:48:07 +0100
Subject: [PATCH] --- yaml --- r: 39235 b: refs/heads/master c:
 03dc55064117508ad474f3eede3a77bf9fbb636f h: refs/heads/master i:   39233:
 b99445380620aa5ed2acb93ec0ae603cbd80fdd2   39231:
 fb14e08ead185a2ad7a5f521e5c42ee3c4d5ea75 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ata/sata_promise.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 669b03b1ebd3..97ed5756bdef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20241ad409fbc42d9e7f92f5fdb4783b7f1b36eb
+refs/heads/master: 03dc55064117508ad474f3eede3a77bf9fbb636f
diff --git a/trunk/drivers/ata/sata_promise.c b/trunk/drivers/ata/sata_promise.c
index d636ede064aa..8bcdfa64667c 100644
--- a/trunk/drivers/ata/sata_promise.c
+++ b/trunk/drivers/ata/sata_promise.c
@@ -360,7 +360,7 @@ static void pdc_sata_phy_reset(struct ata_port *ap)
 static void pdc_pata_cbl_detect(struct ata_port *ap)
 {
 	u8 tmp;
-	void __iomem *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
+	void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
 
 	tmp = readb(mmio);