git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pinctrl-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[sfrench/cifs-2.6.git]
/
arch
/
blackfin
/
mach-common
/
pm.c
diff --git
a/arch/blackfin/mach-common/pm.c
b/arch/blackfin/mach-common/pm.c
index 5ece38a5b75803f7a898ec5a68026b4d453d2b8f..f57b5fe5355ebd56c0c72aff7b33420d7992077f 100644
(file)
--- a/
arch/blackfin/mach-common/pm.c
+++ b/
arch/blackfin/mach-common/pm.c
@@
-15,12
+15,12
@@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/delay.h>
-#include <linux/gpio.h>
#include <asm/cplb.h>
#include <asm/dma.h>
#include <asm/dpmc.h>
#include <asm/pm.h>
#include <asm/cplb.h>
#include <asm/dma.h>
#include <asm/dpmc.h>
#include <asm/pm.h>
+#include <asm/gpio.h>
#ifdef CONFIG_BF60x
struct bfin_cpu_pm_fns *bfin_cpu_pm;
#ifdef CONFIG_BF60x
struct bfin_cpu_pm_fns *bfin_cpu_pm;