kernel: bump 3.18 to 3.18.119

[openwrt/openwrt.git] / target / linux / generic / pending-3.18 / 490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

diff --git a/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index bca3487d186ef47c6cbbf8ffcc5ee6241b47ef5f..b2b46ac6aa8e2a22267274db4d6cb5e509451c7b 100644 (file)
--- a/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c

-@@ -1212,6 +1212,49 @@ static struct mtd_info * __init open_mtd
+@@ -1223,6 +1223,49 @@ static struct mtd_info * __init open_mtd

        return mtd;
  }
  
        return mtd;
  }
  


@@ -61,7 +61,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static int __init ubi_init(void)
  {
        int err, i, k;
  static int __init ubi_init(void)
  {
        int err, i, k;

-@@ -1301,6 +1344,12 @@ static int __init ubi_init(void)
+@@ -1312,6 +1355,12 @@ static int __init ubi_init(void)

                }
        }
  
                }
        }