Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/mtd/nand/omap-nand-flash.c b/drivers/mtd/nand/omap-nand-flash.c
index 6b8fb44573d4ae748e56457e01785730a6c153f2..5263b19c81728ca13f00e63d9e3f29cd3d0fc5d1 100644 (file)
--- a/drivers/mtd/nand/omap-nand-flash.c
+++ b/drivers/mtd/nand/omap-nand-flash.c
@@ -103,7 +103,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
        else
                info->nand.chip_delay = 20;
 
-       info->mtd.name = pdev->dev.bus_id;
+       info->mtd.name = dev_name(&pdev->dev);
        info->mtd.priv = &info->nand;
 
        info->pdata = pdata;