git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'imx/imx6q' into next/soc
[pandora-kernel.git]
/
drivers
/
gpio
/
gpio-nomadik.c
diff --git
a/drivers/gpio/gpio-nomadik.c
b/drivers/gpio/gpio-nomadik.c
index
2c212c7
..
740caed
100644
(file)
--- a/
drivers/gpio/gpio-nomadik.c
+++ b/
drivers/gpio/gpio-nomadik.c
@@
-27,8
+27,9
@@
#include <asm/mach/irq.h>
#include <plat/pincfg.h>
+#include <plat/gpio-nomadik.h>
#include <mach/hardware.h>
-#include <
mach
/gpio.h>
+#include <
asm
/gpio.h>
/*
* The GPIO module in the Nomadik family of Systems-on-Chip is an