From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 10 Jan 2017 13:50:44 +0000 (+0100)
Subject: kernel: update spi-nor.h include fix with upstream accepted version
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ef9208c51eff93c58de02691a87749fb184a2889;p=openwrt%2Fstaging%2Fblogic.git

kernel: update spi-nor.h include fix with upstream accepted version

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/generic/patches-4.4/041-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch b/target/linux/generic/patches-4.4/041-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
new file mode 100644
index 000000000000..8214013c56af
--- /dev/null
+++ b/target/linux/generic/patches-4.4/041-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
@@ -0,0 +1,39 @@
+From 2c81de771f38e54324ede3f24118f4852570b384 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Thu, 26 Nov 2015 09:05:04 +0100
+Subject: [PATCH] mtd: spi-nor: include mtd.h header for struct mtd_info
+ definition
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+So far struct spi_nor was using just a pointer to struct mtd_info so it
+wasn't needed to have it fully defined there. After recent change we
+embed whole struct so we need to include a proper header.
+
+Fixes: 1976367173a4 ("mtd: spi-nor: embed struct mtd_info within struct spi_nor")
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
+---
+ include/linux/mtd/spi-nor.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/include/linux/mtd/spi-nor.h
++++ b/include/linux/mtd/spi-nor.h
+@@ -12,6 +12,7 @@
+ 
+ #include <linux/bitops.h>
+ #include <linux/mtd/cfi.h>
++#include <linux/mtd/mtd.h>
+ 
+ /*
+  * Manufacturer IDs
+@@ -117,8 +118,6 @@ enum spi_nor_option_flags {
+ 	SNOR_F_USE_FSR		= BIT(0),
+ };
+ 
+-struct mtd_info;
+-
+ /**
+  * struct spi_nor - Structure for defining a the SPI NOR layer
+  * @mtd:		point to a mtd_info structure
diff --git a/target/linux/generic/patches-4.4/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch b/target/linux/generic/patches-4.4/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
deleted file mode 100644
index b0a064fb4e74..000000000000
--- a/target/linux/generic/patches-4.4/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 72fc448c4c970bdbba604ab340f16080b4f3bb17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 26 Nov 2015 08:52:09 +0100
-Subject: [PATCH] mtd: spi-nor: include mtd.h header for struct mtd_info
- definition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So far struct spi_nor was using just a pointer to struct mtd_info so it
-wasn't needed to have it fully defined there. After recent change we
-embed whole struct so we need to include a proper header.
-
-Fixes: 1976367173a4 ("mtd: spi-nor: embed struct mtd_info within struct spi_nor")
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- include/linux/mtd/spi-nor.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/include/linux/mtd/spi-nor.h
-+++ b/include/linux/mtd/spi-nor.h
-@@ -12,6 +12,7 @@
- 
- #include <linux/bitops.h>
- #include <linux/mtd/cfi.h>
-+#include <linux/mtd/mtd.h>
- 
- /*
-  * Manufacturer IDs
-@@ -117,8 +118,6 @@ enum spi_nor_option_flags {
- 	SNOR_F_USE_FSR		= BIT(0),
- };
- 
--struct mtd_info;
--
- /**
-  * struct spi_nor - Structure for defining a the SPI NOR layer
-  * @mtd:		point to a mtd_info structure