From 462336ec0941597e0c86161d0d073a82e6228a17 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 2 Jan 2010 15:07:31 +0000 Subject: adm5120: merge 2.6.30+ specific patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18999 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/adm5120/files/drivers/mtd/maps') 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 8bd7ae1c0..ed407ebde 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"); -- cgit v1.2.3