You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
933 B
Diff
28 lines
933 B
Diff
From c0a75d072a501effd66d3392ada8d3f4283b87ef Mon Sep 17 00:00:00 2001
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
|
Date: Thu, 15 Sep 2016 17:40:15 +0200
|
|
Subject: [PATCH] spi: bcm-qspi: don't include linux/mtd/cfi.h
|
|
|
|
The header isn't actually needed here, but including it leads
|
|
to a build warning when CONFIG_MTD is disabled:
|
|
|
|
include/linux/mtd/cfi.h:76:2: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
|
|
|
|
Fixes: fa236a7ef240 (spi: bcm-qspi: Add Broadcom MSPI driver)
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-bcm-qspi.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
--- a/drivers/spi/spi-bcm-qspi.c
|
|
+++ b/drivers/spi/spi-bcm-qspi.c
|
|
@@ -25,7 +25,6 @@
|
|
#include <linux/ioport.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
-#include <linux/mtd/cfi.h>
|
|
#include <linux/mtd/spi-nor.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_irq.h>
|