aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.10
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/lantiq/patches-3.10')
-rw-r--r--target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 3be1bebbe2..192579b0ce 100644
--- a/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/target/linux/lantiq/patches-3.10/0012-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
-@@ -925,10 +925,13 @@ static int m25p_probe(struct spi_device
+@@ -926,10 +926,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;
@@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#endif
/* Platform data helps sort out which chip type we have, as
-@@ -1004,6 +1007,8 @@ static int m25p_probe(struct spi_device
+@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device
if (data && data->name)
flash->mtd.name = data->name;