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 branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-samsung
/
include
/
plat
/
gpio-core.h
diff --git
a/arch/arm/plat-samsung/include/plat/gpio-core.h
b/arch/arm/plat-samsung/include/plat/gpio-core.h
index 51e721f5e4915ac82d27bc070ec5079bb595fa53..c0bfceb88340c52d9d093f2dcedd2db0aad896c3 100644
(file)
--- a/
arch/arm/plat-samsung/include/plat/gpio-core.h
+++ b/
arch/arm/plat-samsung/include/plat/gpio-core.h
@@
-12,6
+12,7
@@
/* Bring in machine-local definitions, especially S3C_GPIO_END */
#include <mach/gpio-samsung.h>
+#include <linux/gpio/driver.h>
#define GPIOCON_OFF (0x00)
#define GPIODAT_OFF (0x04)