From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 13 Dec 2015 18:05:42 +0000 (+0000)
Subject: ar71xx: Update merakinand.sh to fix sysupgrade
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6b87e0706da40d70254b07f857e69265630ef26e;p=openwrt%2Fstaging%2Fadrian.git

ar71xx: Update merakinand.sh to fix sysupgrade

Remove reliance on /lib/upgrade/nand.sh as this is called by sysupgrade,
based on felix's comments at
https://lists.openwrt.org/pipermail/openwrt-devel/2015-December/037963.html

Signed-off-by: Chris R Blake <chrisrblake93@gmail.com>

SVN-Revision: 47889
---

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh b/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
index fe78e9ff96..cc7a86c93d 100644
--- a/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
@@ -7,7 +7,6 @@
 #
 . /lib/ar71xx.sh
 . /lib/functions.sh
-. /lib/upgrade/nand.sh
 
 get_magic_at() {
 	local mtddev=$1