aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-11-13 14:47:58 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-11-13 14:47:58 +0000
commit60091b17d12fabca2592c6de7d6a1f9f6bf328f6 (patch)
treec8275b824182ab2710a11fb9bf8be299caed53f9
parent1d0ec1e9605011cdee7388dc9f5e84ca175c175e (diff)
downloadupstream-60091b17d12fabca2592c6de7d6a1f9f6bf328f6.tar.gz
upstream-60091b17d12fabca2592c6de7d6a1f9f6bf328f6.tar.bz2
upstream-60091b17d12fabca2592c6de7d6a1f9f6bf328f6.zip
ar71xx: refresh patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34186 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/patches-3.3/408-mtd-redboot_partition_scan.patch8
-rw-r--r--target/linux/ar71xx/patches-3.6/408-mtd-redboot_partition_scan.patch6
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ar71xx/patches-3.3/408-mtd-redboot_partition_scan.patch b/target/linux/ar71xx/patches-3.3/408-mtd-redboot_partition_scan.patch
index 9d7a696f1b..59c0b08783 100644
--- a/target/linux/ar71xx/patches-3.3/408-mtd-redboot_partition_scan.patch
+++ b/target/linux/ar71xx/patches-3.3/408-mtd-redboot_partition_scan.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
-@@ -79,6 +79,11 @@ static int parse_redboot_partitions(stru
+@@ -76,6 +76,11 @@ static int parse_redboot_partitions(stru
static char nullstring[] = "unallocated";
#endif
@@ -12,7 +12,7 @@
if ( directory < 0 ) {
offset = master->size + directory * master->erasesize;
while (mtd_can_have_bb(master) &&
-@@ -86,6 +91,7 @@ static int parse_redboot_partitions(stru
+@@ -83,6 +88,7 @@ static int parse_redboot_partitions(stru
if (!offset) {
nogood:
printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
@@ -20,7 +20,7 @@
return -EIO;
}
offset -= master->erasesize;
-@@ -99,10 +105,6 @@ static int parse_redboot_partitions(stru
+@@ -96,10 +102,6 @@ static int parse_redboot_partitions(stru
goto nogood;
}
}
@@ -31,7 +31,7 @@
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset);
-@@ -175,6 +177,11 @@ static int parse_redboot_partitions(stru
+@@ -172,6 +174,11 @@ static int parse_redboot_partitions(stru
}
if (i == numslots) {
/* Didn't find it */
diff --git a/target/linux/ar71xx/patches-3.6/408-mtd-redboot_partition_scan.patch b/target/linux/ar71xx/patches-3.6/408-mtd-redboot_partition_scan.patch
index 4db94a161b..cd41e7ceb2 100644
--- a/target/linux/ar71xx/patches-3.6/408-mtd-redboot_partition_scan.patch
+++ b/target/linux/ar71xx/patches-3.6/408-mtd-redboot_partition_scan.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
-@@ -79,12 +79,18 @@ static int parse_redboot_partitions(stru
+@@ -76,12 +76,18 @@ static int parse_redboot_partitions(stru
static char nullstring[] = "unallocated";
#endif
@@ -19,7 +19,7 @@
return -EIO;
}
offset -= master->erasesize;
-@@ -97,10 +103,6 @@ static int parse_redboot_partitions(stru
+@@ -94,10 +100,6 @@ static int parse_redboot_partitions(stru
goto nogood;
}
}
@@ -30,7 +30,7 @@
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset);
-@@ -173,6 +175,11 @@ static int parse_redboot_partitions(stru
+@@ -170,6 +172,11 @@ static int parse_redboot_partitions(stru
}
if (i == numslots) {
/* Didn't find it */