kernel: update 3.18 to 3.18.1

[openwrt.git] / target / linux / generic / patches-3.18 / 405-mtd-old-firmware-uimage-splitter.patch

diff --git a/target/linux/generic/patches-3.18/405-mtd-old-firmware-uimage-splitter.patch b/target/linux/generic/patches-3.18/405-mtd-old-firmware-uimage-splitter.patch
index a19202a..df1d726 100644 (file)
--- a/target/linux/generic/patches-3.18/405-mtd-old-firmware-uimage-splitter.patch
+++ b/target/linux/generic/patches-3.18/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

-@@ -681,6 +681,37 @@ mtd_pad_erasesize(struct mtd_info *mtd, 
+@@ -681,6 +681,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

-@@ -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)
  {
  
  static void split_firmware(struct mtd_info *master, struct mtd_part *part)
  {