Merge pull request #536 from wigyori/cc-sec

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 041-mtd-bcm47xxpart-backports-from-3.20.patch

diff --git a/target/linux/generic/patches-3.18/041-mtd-bcm47xxpart-backports-from-3.20.patch b/target/linux/generic/patches-3.18/041-mtd-bcm47xxpart-backports-from-3.20.patch
index 59180c2..f3dfa90 100644 (file)
--- a/target/linux/generic/patches-3.18/041-mtd-bcm47xxpart-backports-from-3.20.patch
+++ b/target/linux/generic/patches-3.18/041-mtd-bcm47xxpart-backports-from-3.20.patch
@@ -83,7 +83,7 @@
                                                     offset + trx->offset[i],
                                                     0);
                                i++;
                                                     offset + trx->offset[i],
                                                     0);
                                i++;

-@@ -205,7 +235,8 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -203,7 +233,8 @@ static int bcm47xxpart_parse(struct mtd_

                }
  
                /* Squashfs on devices not using TRX */
                }
  
                /* Squashfs on devices not using TRX */