aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
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
commitf37f5db11d196e7200df16a5085f21ae148fb8bf (patch)
treecf027bf79a12bf4ea90b9a4409256e7c52b50f38 /target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
parent6693c636f40ea19e92a59bfdd4db9fb9b6e2707f (diff)
downloadmaster-187ad058-f37f5db11d196e7200df16a5085f21ae148fb8bf.tar.gz
master-187ad058-f37f5db11d196e7200df16a5085f21ae148fb8bf.tar.bz2
master-187ad058-f37f5db11d196e7200df16a5085f21ae148fb8bf.zip
kernel: add fix for missing include in spi-nor.h (#20973)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47665 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch')
-rw-r--r--target/linux/generic/patches-4.1/142-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch40
1 files changed, 40 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