From: hauke Date: Tue, 24 Nov 2015 20:12:21 +0000 (+0000) Subject: lantiq: fix compile error X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=c4b27c85c4c52aa90e0964ff44efd568c4a2242c;p=openwrt.git lantiq: fix compile error This fixes a problem introduced in r47624. Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47628 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 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