74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
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
|