Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / mtd / nand / omap2.c

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 2ede11683d42087a942c4a95125c1a110411dbc1..516da8f755ae2e6d972aac95582fc5532cea5f08 100644 (file)
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -196,7 +196,7 @@ static void omap_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
 {
        struct nand_chip *nand = mtd->priv;
 
-       __raw_readsl(nand->IO_ADDR_R, buf, len / 2);
+       __raw_readsw(nand->IO_ADDR_R, buf, len / 2);
 }
 
 /*
@@ -599,7 +599,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
        info->gpmc_cs_baseaddr  = pdata->gpmc_cs_baseaddr;
 
        info->mtd.priv          = &info->nand;
-       info->mtd.name          = pdev->dev.bus_id;
+       info->mtd.name          = dev_name(&pdev->dev);
        info->mtd.owner         = THIS_MODULE;
 
        err = gpmc_cs_request(info->gpmc_cs, NAND_IO_SIZE, &info->phys_base);