From 2f4a3b01a0bb919f5b6d9abc6f71329f0c79d7ad Mon Sep 17 00:00:00 2001
From: Vipin Kumar <vipin.kumar@st.com>
Date: Tue, 9 Oct 2012 16:14:43 +0530
Subject: [PATCH] --- yaml --- r: 347146 b: refs/heads/master c:
 605add7db6e84ff78f7ca96541c0880f0166e387 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9a7c85a9aad7..dfa16479193f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db6364a650edcb076786092c7f85f1e1cdae8b20
+refs/heads/master: 605add7db6e84ff78f7ca96541c0880f0166e387
diff --git a/trunk/drivers/mtd/nand/fsmc_nand.c b/trunk/drivers/mtd/nand/fsmc_nand.c
index cb8645087151..a5bc3d5511e3 100644
--- a/trunk/drivers/mtd/nand/fsmc_nand.c
+++ b/trunk/drivers/mtd/nand/fsmc_nand.c
@@ -361,7 +361,7 @@ static void fsmc_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 	struct nand_chip *this = mtd->priv;
 	struct fsmc_nand_data *host = container_of(mtd,
 					struct fsmc_nand_data, mtd);
-	void *__iomem *regs = host->regs_va;
+	void __iomem *regs = host->regs_va;
 	unsigned int bank = host->bank;
 
 	if (ctrl & NAND_CTRL_CHANGE) {