diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-05-26 09:31:16 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-05-26 09:31:16 +0000 |
| commit | dc562c4e6c274ea22db8a11fdfe7ddfe75859e36 (patch) | |
| tree | 4648f29bfc71407aaf187289bb0213ecc000a966 /target/linux/generic/patches-4.0/411-mtd-partial_eraseblock_write.patch | |
| parent | 94a2f9fedebfd48166970d9cd03430129974b949 (diff) | |
| download | master-187ad058-dc562c4e6c274ea22db8a11fdfe7ddfe75859e36.tar.gz master-187ad058-dc562c4e6c274ea22db8a11fdfe7ddfe75859e36.tar.bz2 master-187ad058-dc562c4e6c274ea22db8a11fdfe7ddfe75859e36.zip | |
generic/4.0: update to 4.0.4
Update kernel sources and refresh some patches.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45761 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/411-mtd-partial_eraseblock_write.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/411-mtd-partial_eraseblock_write.patch | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.0/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/patches-4.0/411-mtd-partial_eraseblock_write.patch index 94aa6aecd0..ada7cc1072 100644 --- a/target/linux/generic/patches-4.0/411-mtd-partial_eraseblock_write.patch +++ b/target/linux/generic/patches-4.0/411-mtd-partial_eraseblock_write.patch @@ -97,7 +97,7 @@ if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) instr->fail_addr -= part->offset; instr->addr -= part->offset; -@@ -513,18 +581,21 @@ static struct mtd_part *allocate_partiti +@@ -513,17 +581,20 @@ static struct mtd_part *allocate_partiti if ((slave->mtd.flags & MTD_WRITEABLE) && mtd_mod_by_eb(slave->offset, &slave->mtd)) { /* Doesn't start on a boundary of major erase size */ @@ -127,7 +127,6 @@ } slave->mtd.ecclayout = master->ecclayout; - slave->mtd.ecc_step_size = master->ecc_step_size; --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -55,6 +55,10 @@ struct erase_info { |