projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
kernel: bump 3.18 to 3.18.135
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
pending-3.18
/
044-backport-m25p80-jedec-probe.patch
diff --git
a/target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch
b/target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch
index 41b912d5d454de0dad234dbc255b6af3266d2a02..24c264ba97405949d36dcb455dd5d24fb360ad65 100644
(file)
--- a/
target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch
+++ b/
target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch
@@
-24,7
+24,7
@@
.probe = m25p_probe,
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -9
27,8 +927
,11 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -9
34,8 +934
,11 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;