diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2016-03-03 22:28:12 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-03-03 22:28:12 +0000 |
commit | 5ce6da3d7a65968c6c82b75c31009b0f7bcf528e (patch) | |
tree | 97c5c16b260853f6c026fe0abfcc8e17440ebad5 /target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch | |
parent | 124c1ca86a3c7745555636d67e3d99ad75b07aed (diff) | |
download | upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.gz upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.bz2 upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.zip |
CC: kernel: update kernel 3.18 to version 3.18.27
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.24
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.25
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.26
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.27
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48896 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 de109e35f4..4fb8a87d4c 100644 --- 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,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); |