From 92786b0d7627243b48b1519ba3545cc4081d4beb Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Thu, 13 Sep 2012 18:56:07 -0500 Subject: [PATCH] --- yaml --- r: 332764 b: refs/heads/master c: 2caf87a49eb53fac266b1271ebd6c1d1daa0d0d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/fsl_ifc_nand.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 11c3b6dac10a..fab26033ba67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb0a13a13411c4ce24c48c8ff3cdf7b48d237240 +refs/heads/master: 2caf87a49eb53fac266b1271ebd6c1d1daa0d0d0 diff --git a/trunk/drivers/mtd/nand/fsl_ifc_nand.c b/trunk/drivers/mtd/nand/fsl_ifc_nand.c index e92d223e5e1a..1be83dcc730a 100644 --- a/trunk/drivers/mtd/nand/fsl_ifc_nand.c +++ b/trunk/drivers/mtd/nand/fsl_ifc_nand.c @@ -193,7 +193,7 @@ static int is_blank(struct mtd_info *mtd, unsigned int bufnum) struct nand_chip *chip = mtd->priv; struct fsl_ifc_mtd *priv = chip->priv; u8 __iomem *addr = priv->vbase + bufnum * (mtd->writesize * 2); - u32 __iomem *mainarea = (u32 *)addr; + u32 __iomem *mainarea = (u32 __iomem *)addr; u8 __iomem *oob = addr + mtd->writesize; int i; @@ -591,8 +591,8 @@ static uint8_t fsl_ifc_read_byte16(struct mtd_info *mtd) * next byte. */ if (ifc_nand_ctrl->index < ifc_nand_ctrl->read_bytes) { - data = in_be16((uint16_t *)&ifc_nand_ctrl-> - addr[ifc_nand_ctrl->index]); + data = in_be16((uint16_t __iomem *)&ifc_nand_ctrl-> + addr[ifc_nand_ctrl->index]); ifc_nand_ctrl->index += 2; return (uint8_t) data; }