diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-02 15:07:31 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-02 15:07:31 +0000 |
| commit | 344ba6e886c45ad899c92597878e87944392f4e9 (patch) | |
| tree | 3ccd31a3986076d17215fa325af2e9affc0e65b1 /target/linux/adm5120/files/drivers/mtd/maps | |
| parent | 492534683937c0a015c748f0cafb74ee080590c6 (diff) | |
| download | master-187ad058-344ba6e886c45ad899c92597878e87944392f4e9.tar.gz master-187ad058-344ba6e886c45ad899c92597878e87944392f4e9.tar.bz2 master-187ad058-344ba6e886c45ad899c92597878e87944392f4e9.zip | |
adm5120: merge 2.6.30+ specific patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18999 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/drivers/mtd/maps')
| -rw-r--r-- | target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c | 2 |
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"); |