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 55ba7462cbc9a0563734fade6f9cc669493f0501..516da8f755ae2e6d972aac95582fc5532cea5f08 100644 (file)
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -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);