projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lantiq: add wifi eep to a803 dts file
[openwrt.git]
/
target
/
linux
/
lantiq
/
patches-3.8
/
0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
diff --git
a/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
b/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index
42cf833
..
6df2beb
100644
(file)
--- a/
target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/
target/linux/lantiq/patches-3.8/0001-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 | 5 +++++
1 file changed, 5 insertions(+)
drivers/mtd/devices/m25p80.c | 5 +++++
1 file changed, 5 insertions(+)
-diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
-index 4eeeb2d..b12da33 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
-@@ -8
10,10 +810,13 @@ static int m25p_probe(struct spi_device *spi)
+@@ -8
28,10 +828,13 @@ static int m25p_probe(struct spi_device
unsigned i;
struct mtd_part_parser_data ppdata;
struct device_node __maybe_unused *np = spi->dev.of_node;
unsigned i;
struct mtd_part_parser_data ppdata;
struct device_node __maybe_unused *np = spi->dev.of_node;
@@
-30,7
+28,7
@@
index 4eeeb2d..b12da33 100644
#endif
/* Platform data helps sort out which chip type we have, as
#endif
/* Platform data helps sort out which chip type we have, as
-@@ -
889,6 +892,8 @@ static int m25p_probe(struct spi_device *spi)
+@@ -
907,6 +910,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;
@@
-39,6
+37,3
@@
index 4eeeb2d..b12da33 100644
else
flash->mtd.name = dev_name(&spi->dev);
else
flash->mtd.name = dev_name(&spi->dev);
---
-1.7.10.4
-