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 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-nomadik
/
include
/
plat
/
gpio-nomadik.h
diff --git
a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
index
3ba4d8f
..
9605bf2
100644
(file)
--- a/
arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+++ b/
arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
@@
-67,6
+67,9
@@
extern int nmk_gpio_get_mode(int gpio);
extern void nmk_gpio_wakeups_suspend(void);
extern void nmk_gpio_wakeups_resume(void);
+extern void nmk_gpio_clocks_enable(void);
+extern void nmk_gpio_clocks_disable(void);
+
extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up);
/*