aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-12-13 18:05:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-12-13 18:05:42 +0000
commit6b87e0706da40d70254b07f857e69265630ef26e (patch)
treed87ab8d9675c1b4df73013ded5cebe7d8a98aafd /target/linux/ar71xx
parentbe00acca5aa93568aa01b234666600245176717e (diff)
downloadupstream-6b87e0706da40d70254b07f857e69265630ef26e.tar.gz
upstream-6b87e0706da40d70254b07f857e69265630ef26e.tar.bz2
upstream-6b87e0706da40d70254b07f857e69265630ef26e.zip
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
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh1
1 files changed, 0 insertions, 1 deletions
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