aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-08-18 21:57:54 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-08-18 21:57:54 +0000
commit4a9acacf5341933d0f43476b4aa02de81daff457 (patch)
treee319440c9c56147793f4148f7886617322c7840c /target/linux/brcm47xx
parent770ba9d40fc6a0198e0253c6e6eab283b9a22ebd (diff)
downloadupstream-4a9acacf5341933d0f43476b4aa02de81daff457.tar.gz
upstream-4a9acacf5341933d0f43476b4aa02de81daff457.tar.bz2
upstream-4a9acacf5341933d0f43476b4aa02de81daff457.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> SVN-Revision: 42212
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);