aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-11-26 17:13:05 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-11-26 17:13:05 +0000
commit3ced1d6bb74d40719b8b94f5877451904a1b45f4 (patch)
treefc3a53856ba55d4bb471cc9803912eb12d05c724 /target
parentb44a27885ff6e18f7a2ac03f4bfbb5dd23fee0d4 (diff)
downloadupstream-3ced1d6bb74d40719b8b94f5877451904a1b45f4.tar.gz
upstream-3ced1d6bb74d40719b8b94f5877451904a1b45f4.tar.bz2
upstream-3ced1d6bb74d40719b8b94f5877451904a1b45f4.zip
kernel: add fix for missing include in spi-nor.h (#20973)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 47665
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch40
-rw-r--r--target/linux/generic/patches-4.3/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch40
2 files changed, 80 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch b/target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
new file mode 100644
index 0000000000..f25c79c281
--- /dev/null
+++ b/target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
@@ -0,0 +1,40 @@
+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(-)
+
+diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
+index 7bed974..fac3f6f 100644
+--- 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.3/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch b/target/linux/generic/patches-4.3/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
new file mode 100644
index 0000000000..f25c79c281
--- /dev/null
+++ b/target/linux/generic/patches-4.3/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
@@ -0,0 +1,40 @@
+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(-)
+
+diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
+index 7bed974..fac3f6f 100644
+--- 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