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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
[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
fff4f80
..
166a7a3
100644
(file)
--- a/
arch/arm/include/asm/gpio.h
+++ b/
arch/arm/include/asm/gpio.h
@@
-2,6
+2,6
@@
#define _ARCH_ARM_GPIO_H
/* not all ARM platforms necessarily support this API ... */
-#include <
asm/ar
ch/gpio.h>
+#include <
ma
ch/gpio.h>
#endif /* _ARCH_ARM_GPIO_H */