From 2536629aa8142338387eeaef6c9179d51618f97c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 10 Oct 2006 22:46:37 +0100
Subject: [PATCH] --- yaml --- r: 39226 b: refs/heads/master c:
 afc12d30a74415a49a6ce36d89f82641b46c499b h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mtd/maps/physmap.c     | 2 +-
 trunk/drivers/mtd/nand/cs553x_nand.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bb9fa3b4de93..989f7c33c545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9f627c9df2b6a242cdc25d46f87191941cd0844
+refs/heads/master: afc12d30a74415a49a6ce36d89f82641b46c499b
diff --git a/trunk/drivers/mtd/maps/physmap.c b/trunk/drivers/mtd/maps/physmap.c
index bc7cc71788bc..d1717763f719 100644
--- a/trunk/drivers/mtd/maps/physmap.c
+++ b/trunk/drivers/mtd/maps/physmap.c
@@ -62,7 +62,7 @@ static int physmap_flash_remove(struct platform_device *dev)
 	}
 
 	if (info->map.virt != NULL)
-		iounmap((void *)info->map.virt);
+		iounmap(info->map.virt);
 
 	if (info->res != NULL) {
 		release_resource(info->res);
diff --git a/trunk/drivers/mtd/nand/cs553x_nand.c b/trunk/drivers/mtd/nand/cs553x_nand.c
index e0a1d386e581..94924d52a9b9 100644
--- a/trunk/drivers/mtd/nand/cs553x_nand.c
+++ b/trunk/drivers/mtd/nand/cs553x_nand.c
@@ -249,7 +249,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
 	goto out;
 
 out_ior:
-	iounmap((void *)this->IO_ADDR_R);
+	iounmap(this->IO_ADDR_R);
 out_mtd:
 	kfree(new_mtd);
 out: