kernel: update spi-nor.h include fix with upstream accepted version
[openwrt/openwrt.git] / target / linux / generic / patches-4.4 / 041-mtd-spi-nor-include-mtd.h-header-for-struct-mtd_info.patch
1 From 2c81de771f38e54324ede3f24118f4852570b384 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
3 Date: Thu, 26 Nov 2015 09:05:04 +0100
4 Subject: [PATCH] mtd: spi-nor: include mtd.h header for struct mtd_info
5 definition
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 So far struct spi_nor was using just a pointer to struct mtd_info so it
11 wasn't needed to have it fully defined there. After recent change we
12 embed whole struct so we need to include a proper header.
13
14 Fixes: 1976367173a4 ("mtd: spi-nor: embed struct mtd_info within struct spi_nor")
15 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
16 Signed-off-by: Brian Norris <computersforpeace@gmail.com>
17 ---
18 include/linux/mtd/spi-nor.h | 3 +--
19 1 file changed, 1 insertion(+), 2 deletions(-)
20
21 --- a/include/linux/mtd/spi-nor.h
22 +++ b/include/linux/mtd/spi-nor.h
23 @@ -12,6 +12,7 @@
24
25 #include <linux/bitops.h>
26 #include <linux/mtd/cfi.h>
27 +#include <linux/mtd/mtd.h>
28
29 /*
30 * Manufacturer IDs
31 @@ -117,8 +118,6 @@ enum spi_nor_option_flags {
32 SNOR_F_USE_FSR = BIT(0),
33 };
34
35 -struct mtd_info;
36 -
37 /**
38 * struct spi_nor - Structure for defining a the SPI NOR layer
39 * @mtd: point to a mtd_info structure