adm5120: merge 2.6.30+ specific patches

[openwrt.git] / target / linux / adm5120 / files / drivers / mtd / maps / adm5120-flash.c

diff --git a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
index 8bd7ae1..ed407eb 100644 (file)
--- a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
+++ b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
@@ -233,7 +233,7 @@ static int adm5120_flash_initinfo(struct adm5120_flash_info *info,
        struct flash_desc *fdesc;
        u32 t = 0;
 
-       map->name = dev->dev.bus_id;
+       map->name = dev_name(&dev->dev);
 
        if (dev->id > 1) {
                MAP_ERR(map, "invalid flash id\n");