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 git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
pxa2xx-gpio.h
diff --git
a/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
index 6ef1dd09970b47240ddc5c1ce0447a8e2088a699..d83393e252734398462bf140a9f8086bf09a5c95 100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
+++ b/
arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
@@
-365,4
+365,9
@@
#define GPIO117_I2CSCL_MD (117 | GPIO_ALT_FN_1_IN)
#define GPIO118_I2CSDA_MD (118 | GPIO_ALT_FN_1_IN)
+/*
+ * Handy routine to set GPIO alternate functions
+ */
+extern int pxa_gpio_mode( int gpio_mode );
+
#endif /* __ASM_ARCH_PXA2XX_GPIO_H */