From d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Tue, 20 Dec 2016 05:19:08 -0300 Subject: generic: mtd: backport SPI_NOR_HAS_LOCK This flag was added to 4.9 with upstream commit 76a4707de5e18dc32d9cb4e990686140c5664a15. Signed-off-by: Victor Shyba [refresh and adjust platform patches, fix commit message] Signed-off-by: Mathias Kresin --- .../000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/brcm63xx') diff --git a/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch b/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch index 79af8a6360..74af24bbad 100644 --- a/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch +++ b/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch @@ -68,7 +68,7 @@ Reviewed-by: Boris Brezillon spifi->nor.write = nxp_spifi_write; --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1112,7 +1112,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1113,7 +1113,7 @@ int spi_nor_scan(struct spi_nor *nor, co const struct flash_info *info = NULL; struct device *dev = nor->dev; struct mtd_info *mtd = &nor->mtd; -- cgit v1.2.3