git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd
[pandora-kernel.git]
/
drivers
/
mtd
/
maps
/
pxa2xx-flash.c
diff --git
a/drivers/mtd/maps/pxa2xx-flash.c
b/drivers/mtd/maps/pxa2xx-flash.c
index
0f55589
..
9aad854
100644
(file)
--- a/
drivers/mtd/maps/pxa2xx-flash.c
+++ b/
drivers/mtd/maps/pxa2xx-flash.c
@@
-61,7
+61,7
@@
static int pxa2xx_flash_probe(struct platform_device *pdev)
if (!info)
return -ENOMEM;
- info->map.name =
(char *)
flash->name;
+ info->map.name = flash->name;
info->map.bankwidth = flash->width;
info->map.phys = res->start;
info->map.size = resource_size(res);