aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-03-11 17:08:46 +0000
committerJohn Crispin <blogic@openwrt.org>2015-03-11 17:08:46 +0000
commit41afbc70a7d406a115a2e65e11432513ceefed5c (patch)
treeda09d268245b0b74ea92d7c3482a14a49642eceb /target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
parent2c0cefef77fd89697cbb281cd3eccc4c4bd24ef2 (diff)
downloadmaster-187ad058-41afbc70a7d406a115a2e65e11432513ceefed5c.tar.gz
master-187ad058-41afbc70a7d406a115a2e65e11432513ceefed5c.tar.bz2
master-187ad058-41afbc70a7d406a115a2e65e11432513ceefed5c.zip
kenrel: refresh patches
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44678 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
-rw-r--r--target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 98fe4c2b77..203eb9495e 100644
--- a/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/target/linux/lantiq/patches-3.18/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>
-@@ -198,6 +199,10 @@
+@@ -198,6 +199,10 @@ static int m25p_probe(struct spi_device
enum read_mode mode = SPI_NOR_NORMAL;
char *flash_name = NULL;
int ret;
@@ -33,7 +33,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
data = dev_get_platdata(&spi->dev);
-@@ -229,6 +234,8 @@
+@@ -229,6 +234,8 @@ static int m25p_probe(struct spi_device
if (data && data->name)
flash->mtd.name = data->name;