diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-09-27 09:44:24 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-09-27 09:44:24 +0000 |
| commit | 71a03fb16860e6f94d1f58c0754e74486c8167b2 (patch) | |
| tree | 2448fb6a3c073be1743a20a3ad8c969dd8f5d6bc /target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | |
| parent | 8e525a43b45f4bd4f88a438880f416285e23b0be (diff) | |
| download | upstream-71a03fb16860e6f94d1f58c0754e74486c8167b2.tar.gz upstream-71a03fb16860e6f94d1f58c0754e74486c8167b2.tar.bz2 upstream-71a03fb16860e6f94d1f58c0754e74486c8167b2.zip | |
kernel: merge two mtdpart.c patches
It does not make sense to add some code and remove is 4 patches later.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 42673
Diffstat (limited to 'target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch index a614094851..92a3ee7633 100644 --- a/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +++ b/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -627,6 +627,37 @@ int mtd_del_partition(struct mtd_info *m +@@ -628,6 +628,37 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -38,7 +38,7 @@ static inline unsigned long mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len) { -@@ -686,6 +717,10 @@ static void split_rootfs_data(struct mtd +@@ -660,6 +691,10 @@ static void split_rootfs_data(struct mtd unsigned int split_size; int ret; @@ -49,7 +49,7 @@ ret = split_squashfs(master, part->offset, &split_offset); if (ret) return; -@@ -735,6 +770,12 @@ static void split_uimage(struct mtd_info +@@ -709,6 +744,12 @@ static void split_uimage(struct mtd_info static void split_firmware(struct mtd_info *master, struct mtd_part *part) { |