diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:51:34 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:51:34 +0000 |
| commit | 93b50ade934436d00e5f68c3feabf030ace8d98d (patch) | |
| tree | 50c113c26115c6815362f0c4a24d03b75c571a76 /target/linux/brcm47xx/patches-4.1 | |
| parent | ba3a749f9b29b40784bb576651142c601d4a7211 (diff) | |
| download | upstream-93b50ade934436d00e5f68c3feabf030ace8d98d.tar.gz upstream-93b50ade934436d00e5f68c3feabf030ace8d98d.tar.bz2 upstream-93b50ade934436d00e5f68c3feabf030ace8d98d.zip | |
kernel/4.1: update to version 4.1.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48223
Diffstat (limited to 'target/linux/brcm47xx/patches-4.1')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch | 4 |
1 files changed, 2 insertions, 2 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 de109e35f4..4fb8a87d4c 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,6 +1,6 @@ --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -@@ -100,6 +100,7 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -127,6 +127,7 @@ static int bcm47xxpart_parse(struct mtd_ int last_trx_part = -1; int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; int err; @@ -8,7 +8,7 @@ /* * Some really old flashes (like AT45DB*) had smaller erasesize-s, but -@@ -306,12 +307,23 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -334,12 +335,23 @@ static int bcm47xxpart_parse(struct mtd_ if (buf[0] == NVRAM_HEADER) { bcm47xxpart_add_part(&parts[curr_part++], "nvram", master->size - blocksize, 0); |