projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.14 to 3.14.27
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.14
/
405-mtd-old-firmware-uimage-splitter.patch
diff --git
a/target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
b/target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
index
c4ceb82
..
cc52781
100644
(file)
--- a/
target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
+++ b/
target/linux/generic/patches-3.14/405-mtd-old-firmware-uimage-splitter.patch
@@
-14,7
+14,7
@@
endmenu
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
endmenu
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -668,6 +668,37 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+@@ -668,6 +668,37 @@ mtd_pad_erasesize(struct mtd_info *mtd,
return len;
}
return len;
}
@@
-52,7
+52,7
@@
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else
-@@ -676,7 +707,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+@@ -676,7 +707,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
static void split_firmware(struct mtd_info *master, struct mtd_part *part)
{
static void split_firmware(struct mtd_info *master, struct mtd_part *part)
{