brcm47xx: make bcm47xxpart patch apply after recent backports

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r47806

SVN-Revision: 47808

diff --git a/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch
index df51191ad88239b33ffb1f1e9555f514c7c47104..de109e35f4da61850dd5a22f60ed904764a8f667 100644 (file)
--- a/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/brcm47xx/patches-3.18/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);