projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
drivers
/
mtd
/
maps
/
ixp4xx.c
diff --git
a/drivers/mtd/maps/ixp4xx.c
b/drivers/mtd/maps/ixp4xx.c
index 16555cbeaea4572e383189ea88f3f153338431b8..7214b876febaea91e339e5964a0d6c1cb463899f 100644
(file)
--- a/
drivers/mtd/maps/ixp4xx.c
+++ b/
drivers/mtd/maps/ixp4xx.c
@@
-218,7
+218,7
@@
static int ixp4xx_flash_probe(struct platform_device *dev)
* handle that.
*/
info->map.bankwidth = 2;
- info->map.name = dev
->dev.bus_id
;
+ info->map.name = dev
_name(&dev->dev)
;
info->map.read = ixp4xx_read16,
info->map.write = ixp4xx_probe_write16,
info->map.copy_from = ixp4xx_copy_from,