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 tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
gpio.h
diff --git
a/arch/arm/include/asm/gpio.h
b/arch/arm/include/asm/gpio.h
index
c402e9b
..
477e020
100644
(file)
--- a/
arch/arm/include/asm/gpio.h
+++ b/
arch/arm/include/asm/gpio.h
@@
-6,7
+6,9
@@
#endif
/* not all ARM platforms necessarily support this API ... */
+#ifdef CONFIG_NEED_MACH_GPIO_H
#include <mach/gpio.h>
+#endif
#ifndef __ARM_GPIOLIB_COMPLEX
/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */