kernel: bump 4.14 to 4.14.66

[openwrt/staging/dedeckeh.git] / target / linux / ar71xx / patches-4.14 / 407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch

diff --git a/target/linux/ar71xx/patches-4.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-4.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
index cfc84c4afa198bfbab3ec162836d8dd408c85958..13999064cb445fe2fbc896787b7a362e83ac3ea6 100644 (file)
--- a/target/linux/ar71xx/patches-4.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
+++ b/target/linux/ar71xx/patches-4.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -195,6 +195,7 @@ static ssize_t m25p80_read(struct spi_no
+@@ -235,6 +235,7 @@ static ssize_t m25p80_read(struct spi_no
   */
  static int m25p_probe(struct spi_device *spi)
  {
@@ -8,7 +8,7 @@
        struct flash_platform_data      *data;
        struct m25p *flash;
        struct spi_nor *nor;
-@@ -247,8 +248,11 @@ static int m25p_probe(struct spi_device
+@@ -300,8 +301,11 @@ static int m25p_probe(struct spi_device
        if (ret)
                return ret;
  
@@ -24,7 +24,7 @@
  
 --- a/include/linux/spi/flash.h
 +++ b/include/linux/spi/flash.h
-@@ -24,6 +24,7 @@ struct flash_platform_data {
+@@ -25,6 +25,7 @@ struct flash_platform_data {
        unsigned int    nr_parts;
  
        char            *type;