summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/drivers/mtd/maps
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-02 15:07:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-02 15:07:31 +0000
commit9240fe972de66eaf3a5cf404618e39e7d1a4c0f3 (patch)
tree7cec7083b1160d573421df7a484f57122f115a47 /target/linux/adm5120/files/drivers/mtd/maps
parent5acf538f1380f40f80d650a7d0ac655b9e362446 (diff)
downloadmaster-31e0f0ae-9240fe972de66eaf3a5cf404618e39e7d1a4c0f3.tar.gz
master-31e0f0ae-9240fe972de66eaf3a5cf404618e39e7d1a4c0f3.tar.bz2
master-31e0f0ae-9240fe972de66eaf3a5cf404618e39e7d1a4c0f3.zip
adm5120: merge 2.6.30+ specific patches
SVN-Revision: 18999
Diffstat (limited to 'target/linux/adm5120/files/drivers/mtd/maps')
-rw-r--r--target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c2
1 files changed, 1 insertions, 1 deletions
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 8bd7ae1c0b..ed407ebdec 100644
--- 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");