kernel: bump 4.9 to 4.9.117 for 18.06

[openwrt/openwrt.git] / target / linux / lantiq / patches-4.9 / 0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch

diff --git a/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 7617c14ddb57cb4e0b9b065029afb33f4b61c869..cfeded1ebc1808030f6bae7977e0022790ae4892 100644 (file)
--- a/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
@@ -22,7 +22,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
-@@ -200,6 +201,10 @@ static int m25p_probe(struct spi_device
+@@ -201,6 +202,10 @@ static int m25p_probe(struct spi_device
        enum read_mode mode = SPI_NOR_NORMAL;
        char *flash_name;
        int ret;
@@ -33,7 +33,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
        data = dev_get_platdata(&spi->dev);
  
-@@ -229,6 +234,8 @@ static int m25p_probe(struct spi_device
+@@ -230,6 +235,8 @@ static int m25p_probe(struct spi_device
  
        if (data && data->name)
                nor->mtd.name = data->name;