From 9348e132559be1d3bed507a8723782f424b8ac0d Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 24 Mar 2009 16:38:21 -0700
Subject: [PATCH] --- yaml --- r: 133414 b: refs/heads/master c:
 c36f1e3301ee9d8045938a2741da7f8e4c7fbbff h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 373bada81c40..bc7358a77dd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48f8151ea68ad78391ef6ff12a83e6fbdb6094f6
+refs/heads/master: c36f1e3301ee9d8045938a2741da7f8e4c7fbbff
diff --git a/trunk/drivers/mtd/nand/ndfc.c b/trunk/drivers/mtd/nand/ndfc.c
index 582cf80f555a..89bf85af642c 100644
--- a/trunk/drivers/mtd/nand/ndfc.c
+++ b/trunk/drivers/mtd/nand/ndfc.c
@@ -187,7 +187,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
 		return -ENODEV;
 
 	ndfc->mtd.name = kasprintf(GFP_KERNEL, "%s.%s",
-				   ndfc->ofdev->dev.bus_id, flash_np->name);
+			dev_name(&ndfc->ofdev->dev), flash_np->name);
 	if (!ndfc->mtd.name) {
 		ret = -ENOMEM;
 		goto err;