diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-11-10 22:51:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-11-10 22:51:30 +0000 |
| commit | a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b (patch) | |
| tree | f5a849fbbd0c2bb9bc9ba75b80f9ff679a707b09 /target/linux/brcm47xx | |
| parent | c5b5e68879238d195e7a797ca82c8e0043e797ee (diff) | |
| download | upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.gz upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.bz2 upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.zip | |
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 43229
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch index 0b3874b329..47f51ef8b0 100644 --- a/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch +++ b/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -@@ -89,6 +89,7 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -93,6 +93,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; -@@ -269,12 +270,23 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -281,12 +282,23 @@ static int bcm47xxpart_parse(struct mtd_ if (buf[0] == NVRAM_HEADER) { bcm47xxpart_add_part(&parts[curr_part++], "nvram", master->size - blocksize, 0); |