generic: mtd: backport SPI_NOR_HAS_LOCK

[openwrt/staging/yousong.git] / target / linux / layerscape / patches-4.4 / 1078-mtd-spi-nor-drop-flash_node-field.patch

diff --git a/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch b/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch
index 08fe44253a98cf00a9af311fdc6f47310a883dbf..45c69a85cdeafcca354d4aa8d1df5ee82b05661a 100644 (file)
--- a/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch
+++ b/target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch
@@ -14,7 +14,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1218,7 +1218,6 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1221,7 +1221,6 @@ int spi_nor_scan(struct spi_nor *nor, co
                mtd->flags |= MTD_NO_ERASE;
  
        mtd->dev.parent = dev;