diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-12-07 18:38:20 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-12-07 18:38:20 +0000 |
| commit | c1aaa64f2a653d7ad2e8e52463a1a49d18e8fef7 (patch) | |
| tree | baf9dac48d5b361afce4910e6d5bc2c934842198 /target/linux/brcm47xx | |
| parent | 1b22b08b149468bdaf72935c2583cd43f00845a2 (diff) | |
| download | master-187ad058-c1aaa64f2a653d7ad2e8e52463a1a49d18e8fef7.tar.gz master-187ad058-c1aaa64f2a653d7ad2e8e52463a1a49d18e8fef7.tar.bz2 master-187ad058-c1aaa64f2a653d7ad2e8e52463a1a49d18e8fef7.zip | |
brcm47xx: make bcm47xxpart patch apply after recent backports
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47806 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch | 6 |
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); |