diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-02 18:33:58 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-02 18:33:58 -0700 |
| commit | 06b851e58b73a268f8092c2d990f697b2e7c53bd (patch) | |
| tree | a44e10462a39202b60636f8b102376a9c69169c1 /arch/arm/mach-at91/include | |
| parent | 5f03dc2002f5dc85ce87e69caff7f28f17f5c9b2 (diff) | |
| parent | 17e7979f83c1de305fa81efb0aa7a3a56bd8121c (diff) | |
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc
* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6: (604 commits)
ARM: LPC32xx: defconfig update: Cleanup (EXPERIMENTAL)
ARM: LPC32xx: defconfig update: Remove the museum NAND option
ARM: LPC32xx: defconfig update: Default drivers and cleanup
ARM: LPC32xx: defconfig update: gpio and keys
+ Linux 3.9-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-at91/include')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/gpio.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index eed465ab0dd..5fc23771c15 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -209,6 +209,14 @@ extern int at91_get_gpio_value(unsigned pin); extern void at91_gpio_suspend(void); extern void at91_gpio_resume(void); +#ifdef CONFIG_PINCTRL_AT91 +extern void at91_pinctrl_gpio_suspend(void); +extern void at91_pinctrl_gpio_resume(void); +#else +static inline void at91_pinctrl_gpio_suspend(void) {} +static inline void at91_pinctrl_gpio_resume(void) {} +#endif + #endif /* __ASSEMBLY__ */ #endif |