aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-08-18 21:57:54 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-08-18 21:57:54 +0000
commitc41d5581c190d6feba0232a32bc99e8a3d307555 (patch)
tree883519b0efc61edaa6bac4d25f40b06e8ac45bf3 /target/linux/brcm47xx
parentd2fc14ca6c9e36f50c7ba4989496793d9904db1a (diff)
downloadupstream-c41d5581c190d6feba0232a32bc99e8a3d307555.tar.gz
upstream-c41d5581c190d6feba0232a32bc99e8a3d307555.tar.bz2
upstream-c41d5581c190d6feba0232a32bc99e8a3d307555.zip
kernel: 3.14: update bcm47xxpart
It it used by brcm47xx and bcm53xx targets, so put patches in generic. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42212 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
index 086d7b3a4d..0b3874b329 100644
--- a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -68,6 +68,7 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -89,6 +89,7 @@ static int bcm47xxpart_parse(struct mtd_
int trx_part = -1;
int last_trx_part = -1;
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
@@ -8,7 +8,7 @@
if (blocksize <= 0x10000)
blocksize = 0x10000;
-@@ -229,12 +230,23 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -269,12 +270,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);