aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-12-07 18:38:20 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-12-07 18:38:20 +0000
commita8ac38474677f54ea3516640566b9b8090c27efd (patch)
tree1bf9f67125d0fd17c98472183b7900a8fb87c1f2 /target
parentb775b4d5591e5566e1ecf86729f00ee52c5f42b3 (diff)
downloadupstream-a8ac38474677f54ea3516640566b9b8090c27efd.tar.gz
upstream-a8ac38474677f54ea3516640566b9b8090c27efd.tar.bz2
upstream-a8ac38474677f54ea3516640566b9b8090c27efd.zip
brcm47xx: make bcm47xxpart patch apply after recent backports
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 47806
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch
index df51191ad8..de109e35f4 100644
--- a/target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch
@@ -1,14 +1,14 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -97,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_
- int trx_part = -1;
+@@ -100,6 +100,7 @@ static int bcm47xxpart_parse(struct mtd_
int last_trx_part = -1;
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
+ int err;
+ bool found_nvram = false;
/*
* Some really old flashes (like AT45DB*) had smaller erasesize-s, but
-@@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -306,12 +307,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);