diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:09:45 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:09:45 +0000 |
| commit | 379d2b7f95801d8ba7c2ffdc06d6b48ac47ad405 (patch) | |
| tree | a561c8f80acfaa84fdda006720bd3f1517aee500 /target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | |
| parent | 206aa3837fa88a95c2bedcb18fbf4bc33df69598 (diff) | |
| download | upstream-379d2b7f95801d8ba7c2ffdc06d6b48ac47ad405.tar.gz upstream-379d2b7f95801d8ba7c2ffdc06d6b48ac47ad405.tar.bz2 upstream-379d2b7f95801d8ba7c2ffdc06d6b48ac47ad405.zip | |
lantiq: fix patches after 3.14.32 bump
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44320 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 8ebdc99878..4c010f8282 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 <blogic@openwrt.org> --- 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 <blogic@openwrt.org> /* 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; |