aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-11-24 20:12:21 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-11-24 20:12:21 +0000
commit6de0388cf3fd52512305a694ae817ced040a921a (patch)
tree41edbd486f53f03c412ec5eb6d06c5bc1886cf8f /target/linux
parente516bca1daf7bb144e230107b76ce9875fa21aed (diff)
downloadmaster-187ad058-6de0388cf3fd52512305a694ae817ced040a921a.tar.gz
master-187ad058-6de0388cf3fd52512305a694ae817ced040a921a.tar.bz2
master-187ad058-6de0388cf3fd52512305a694ae817ced040a921a.zip
lantiq: fix compile error
This fixes a problem introduced in r47624. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47628 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 535069c58d..25f3fff213 100644
--- a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
@@ -38,7 +38,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
if (data && data->name)
nor->mtd.name = data->name;
+ else if (of_mtd_name)
-+ flash->mtd.name = of_mtd_name;
++ nor->mtd.name = of_mtd_name;
/* For some (historical?) reason many platforms provide two different
* names in flash_platform_data: "name" and "type". Quite often name is