projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update linux 3.8 to 3.8.7
[openwrt/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 3daec9f8ace61d45f5d297afae615d8d15bfbf90..6df2beb1cad2a7190a40ac0d9419ea939579465c 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
@@
-14,7
+14,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -82
7,10 +827
,13 @@ static int m25p_probe(struct spi_device
+@@ -82
8,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;
@@
-28,7
+28,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
#endif
/* Platform data helps sort out which chip type we have, as
#endif
/* Platform data helps sort out which chip type we have, as
-@@ -90
6,6 +909
,8 @@ static int m25p_probe(struct spi_device
+@@ -90
7,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;