Changeset 47806


Ignore:
Timestamp:
2015-12-07T19:38:20+01:00 (2 years ago)
Author:
rmilecki
Message:

brcm47xx: make bcm47xxpart patch apply after recent backports

Signed-off-by: Rafał Miłecki <zajec5@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch

    r45570 r47806  
    11--- a/drivers/mtd/bcm47xxpart.c 
    22+++ b/drivers/mtd/bcm47xxpart.c 
    3 @@ -97,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_ 
    4         int trx_part = -1; 
     3@@ -100,6 +100,7 @@ static int bcm47xxpart_parse(struct mtd_ 
    54        int last_trx_part = -1; 
    65        int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; 
     6        int err; 
    77+       bool found_nvram = false; 
    88  
    99        /* 
    1010         * Some really old flashes (like AT45DB*) had smaller erasesize-s, but 
    11 @@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_ 
     11@@ -306,12 +307,23 @@ static int bcm47xxpart_parse(struct mtd_ 
    1212                if (buf[0] == NVRAM_HEADER) { 
    1313                        bcm47xxpart_add_part(&parts[curr_part++], "nvram", 
Note: See TracChangeset for help on using the changeset viewer.