summaryrefslogtreecommitdiff
path: root/arch/blackfin/kernel/debug-mmrs.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-10-17 12:46:09 +0300
committerLinus Walleij <linus.walleij@linaro.org>2017-10-19 11:12:49 +0300
commit350bdb84fda89270703907fb4c4fb482e1edbc31 (patch)
treecdafa891ddc3a07f7a12b125602b517485ef9ca7 /arch/blackfin/kernel/debug-mmrs.c
parent1c363531dd814dc4fe10865722bf6b0f72ce4673 (diff)
downloadlinux-350bdb84fda89270703907fb4c4fb482e1edbc31.tar.xz
blackfin: Fix local <asm/gpio.h> includes
When making the pin control submenu globally visible, all kinds of oddities appear, in blackfin a few files were #including <linux/gpio.h> and relying on that to pull in <asm/gpio.h>. This was not working when pin control but not GPIOLIB was selected resulting in a breakage in allmodconfig. The code these files were using was still there and defined in <asm/gpio.h> just not pulle in from just including <linux/gpio.h> Simply add the required includes explicitly in the blackfin kernel core and everything compiles fine. Delete the use of the incorrect <linux/gpio.h> where possible. Add stubs to <asm/gpio.h> for the functions called from PM: these should probably also depend on !PINCTRL but since the global CONFIG_PM symbol is used to compile PM support, we need some more intrusive thing here, to be tested by Blackfin maintainers. Cc: Steven Miao <realmz6@gmail.com> Cc: Huanhuan Feng <huanhuan.feng@analog.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/blackfin/kernel/debug-mmrs.c')
-rw-r--r--arch/blackfin/kernel/debug-mmrs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index f31ace221392..194773ce109e 100644
--- a/arch/blackfin/kernel/debug-mmrs.c
+++ b/arch/blackfin/kernel/debug-mmrs.c
@@ -10,7 +10,6 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/gpio.h>
#include <asm/blackfin.h>
#include <asm/gptimers.h>
@@ -20,6 +19,7 @@
#include <asm/bfin_serial.h>
#include <asm/bfin5xx_spi.h>
#include <asm/bfin_twi.h>
+#include <asm/gpio.h>
/* Common code defines PORT_MUX on us, so redirect the MMR back locally */
#ifdef BFIN_PORT_MUX