From 0e2586a7748385c97062a8d8816c98011175fb3d Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 11 Jan 2014 16:06:37 +0000 Subject: kernel: update 3.10 to 3.10.26 Signed-off-by: Gabor Juhos SVN-Revision: 39220 --- .../patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch') 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 3be1beb..192579b 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 --- 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 #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; -- cgit v1.1