aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-01-12 18:50:45 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-01-12 18:50:45 +0000
commitb26aeffe76854b683b28273108c97d560138cef7 (patch)
treee9b37577fc52e745c79274ae458da97281b9c854 /target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch
parentefd0e137a75a29619b8121fe8266267f4a1ea195 (diff)
downloadmaster-187ad058-b26aeffe76854b683b28273108c97d560138cef7.tar.gz
master-187ad058-b26aeffe76854b683b28273108c97d560138cef7.tar.bz2
master-187ad058-b26aeffe76854b683b28273108c97d560138cef7.zip
brcm47xx: update mtd drivers
This backports some patches from linux upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39249 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch
index 4cd78c2011..086d7b3a4d 100644
--- a/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -65,6 +65,7 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -68,6 +68,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;
-@@ -190,12 +191,23 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -229,12 +230,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);