kernel: update 3.18 to 3.18.1

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 43821
This commit is contained in:
Luka Perkov
2015-01-03 22:59:47 +00:00
parent 9c8422a09b
commit deb35ad4ac
7 changed files with 21 additions and 30 deletions

View File

@@ -14,7 +14,7 @@
endmenu
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -681,6 +681,37 @@ mtd_pad_erasesize(struct mtd_info *mtd,
@@ -681,6 +681,37 @@ mtd_pad_erasesize(struct mtd_info *mtd,
return len;
}
@@ -52,7 +52,7 @@
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else
@@ -689,7 +720,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
@@ -689,7 +720,14 @@ mtd_pad_erasesize(struct mtd_info *mtd,
static void split_firmware(struct mtd_info *master, struct mtd_part *part)
{