From 683da1384bc567d1a29544ca98f56dea4542cb3c Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sun, 8 Feb 2015 15:09:45 +0000 Subject: lantiq: fix patches after 3.14.32 bump Signed-off-by: Luka Perkov SVN-Revision: 44320 --- .../patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch') diff --git a/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 8ebdc99..4c010f8 100644 --- a/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-3.14/0022-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 -@@ -1105,6 +1105,10 @@ static int m25p_probe(struct spi_device +@@ -1105,6 +1105,10 @@ static int m25p_probe(struct spi_device struct mtd_part_parser_data ppdata; struct device_node *np = spi->dev.of_node; int ret; @@ -25,7 +25,7 @@ Signed-off-by: John Crispin /* Platform data helps sort out which chip type we have, as * well as how this board partitions it. If we don't have -@@ -1177,6 +1181,8 @@ static int m25p_probe(struct spi_device +@@ -1177,6 +1181,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; -- cgit v1.1