projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
pinctrl
/
intel
/
pinctrl-merrifield.c
diff --git
a/drivers/pinctrl/intel/pinctrl-merrifield.c
b/drivers/pinctrl/intel/pinctrl-merrifield.c
index
eb4990f
..
7fb7656
100644
(file)
--- a/
drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/
drivers/pinctrl/intel/pinctrl-merrifield.c
@@
-11,6
+11,7
@@
#include <linux/bitops.h>
#include <linux/err.h>
+#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pinctrl/pinconf.h>