projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ralink: use fe_reset to control all reset
[oweals/openwrt.git]
/
target
/
linux
/
lantiq
/
patches-3.14
/
0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
diff --git
a/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
b/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 44970a5466b6b6cb7873550c4400ad152bdbee49..8ebdc99878d1366d1dfb5f029e71ad4640ff2083 100644
(file)
--- a/
target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/
target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
@@
-12,11
+12,9
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/mtd/devices/m25p80.c | 6 ++++++
1 file changed, 6 insertions(+)
drivers/mtd/devices/m25p80.c | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
-index ad19139..9f7b35a 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -1
097,6 +1097,10 @@ static int m25p_probe(struct spi_device *spi)
+@@ -1
105,6 +1105,10 @@ static int m25p_probe(struct spi_device
struct mtd_part_parser_data ppdata;
struct device_node *np = spi->dev.of_node;
int ret;
struct mtd_part_parser_data ppdata;
struct device_node *np = spi->dev.of_node;
int ret;
@@
-27,7
+25,7
@@
index ad19139..9f7b35a 100644
/* Platform data helps sort out which chip type we have, as
* well as how this board partitions it. If we don't have
/* Platform data helps sort out which chip type we have, as
* well as how this board partitions it. If we don't have
-@@ -11
69,6 +1173,8 @@ static int m25p_probe(struct spi_device *spi)
+@@ -11
77,6 +1181,8 @@ static int m25p_probe(struct spi_device
if (data && data->name)
flash->mtd.name = data->name;
if (data && data->name)
flash->mtd.name = data->name;
@@
-36,6
+34,3
@@
index ad19139..9f7b35a 100644
else
flash->mtd.name = dev_name(&spi->dev);
else
flash->mtd.name = dev_name(&spi->dev);
---
-1.7.10.4
-