diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
commit | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (patch) | |
tree | 48716af89f175c89a9be2247f77e13099980e43f /arch/arm/plat-omap/include/mach/gpio.h | |
parent | 5a07055a3849574f4fbe5d0ce7cd2d26ab9a37c1 (diff) | |
parent | 2e7509e5b3acc4b8653faa1966e5ac234d36ac82 (diff) | |
download | op-kernel-dev-8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f.zip op-kernel-dev-8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f.tar.gz |
Merge branch 'omap2-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/plat-omap/include/mach/gpio.h')
-rw-r--r-- | arch/arm/plat-omap/include/mach/gpio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h index 4cb818d..5bb7460 100644 --- a/arch/arm/plat-omap/include/mach/gpio.h +++ b/arch/arm/plat-omap/include/mach/gpio.h @@ -76,6 +76,8 @@ extern void omap_free_gpio(int gpio); extern void omap_set_gpio_direction(int gpio, int is_input); extern void omap_set_gpio_dataout(int gpio, int enable); extern int omap_get_gpio_datain(int gpio); +extern void omap2_gpio_prepare_for_retention(void); +extern void omap2_gpio_resume_after_retention(void); extern void omap_set_gpio_debounce(int gpio, int enable); extern void omap_set_gpio_debounce_time(int gpio, int enable); |