projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.19 to 4.19.86
[openwrt/staging/wigyori.git]
/
target
/
linux
/
lantiq
/
patches-4.19
/
0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
diff --git
a/target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
b/target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 90dc20b901be433bb235eda74993861972a7d0a4..fbdd117dea83db5bb185a43fc7add96941731857 100644
(file)
--- a/
target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/
target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
@@
-22,7
+22,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-@@ -1
80,6 +181
,10 @@ static int m25p_probe(struct spi_mem *sp
+@@ -1
73,6 +174
,10 @@ static int m25p_probe(struct spi_mem *sp
};
char *flash_name;
int ret;
};
char *flash_name;
int ret;
@@
-33,7
+33,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
data = dev_get_platdata(&spimem->spi->dev);
data = dev_get_platdata(&spimem->spi->dev);
-@@ -21
8,6 +223
,8 @@ static int m25p_probe(struct spi_mem *sp
+@@ -21
1,6 +216
,8 @@ static int m25p_probe(struct spi_mem *sp
if (data && data->name)
nor->mtd.name = data->name;
if (data && data->name)
nor->mtd.name = data->name;