projects
/
platform
/
kernel
/
u-boot.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.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
drivers
/
mtd
/
spi
/
spansion.c
diff --git
a/drivers/mtd/spi/spansion.c
b/drivers/mtd/spi/spansion.c
index
2218e2f
..
b3ef90f
100644
(file)
--- a/
drivers/mtd/spi/spansion.c
+++ b/
drivers/mtd/spi/spansion.c
@@
-101,7
+101,7
@@
static const struct spansion_spi_flash_params spansion_spi_flash_table[] = {
.idcode2 = 0x4d01,
.pages_per_sector = 256,
.nr_sectors = 256,
- .name = "S25FL129P_64K",
+ .name = "S25FL129P_64K
/S25FL128S
",
},
{
.idcode1 = 0x0219,