aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-11-24 20:12:21 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-11-24 20:12:21 +0000
commit34e0d3cb5a9fd4b68126240a73114d0a74ab702d (patch)
treec0e773380d4fa905a05f77639349771f2c4da598
parentd8a62fdbc28c8b716094cbee18a361ebad035eda (diff)
downloadupstream-34e0d3cb5a9fd4b68126240a73114d0a74ab702d.tar.gz
upstream-34e0d3cb5a9fd4b68126240a73114d0a74ab702d.tar.bz2
upstream-34e0d3cb5a9fd4b68126240a73114d0a74ab702d.zip
lantiq: fix compile error
This fixes a problem introduced in r47624. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47628
-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