diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-27 12:31:02 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-27 12:31:02 -0400 |
| commit | dadb3660a3ad162ac6e76be7262c72f48177f1aa (patch) | |
| tree | 9298fc01b98d5f56afb1494ddedddcc753f2e2b4 /include/linux/gpio-pxa.h | |
| parent | b7b617c527224acd862274fc58ff16dd34ab6466 (diff) | |
| parent | ef7c7c693b4b05a293678fd40ed1511bc94d6f61 (diff) | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux:
ARM: PXA2xx: MFP: fix potential direction bug
ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUT
arm/sa1100: fix sa1100-rtc memory resource
ARM: pxa: fix gpio wakeup setting
Diffstat (limited to 'include/linux/gpio-pxa.h')
| -rw-r--r-- | include/linux/gpio-pxa.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/gpio-pxa.h b/include/linux/gpio-pxa.h index 05071ee34c3f..d755b28ba635 100644 --- a/include/linux/gpio-pxa.h +++ b/include/linux/gpio-pxa.h | |||
| @@ -13,4 +13,8 @@ extern int pxa_last_gpio; | |||
| 13 | 13 | ||
| 14 | extern int pxa_irq_to_gpio(int irq); | 14 | extern int pxa_irq_to_gpio(int irq); |
| 15 | 15 | ||
| 16 | struct pxa_gpio_platform_data { | ||
| 17 | int (*gpio_set_wake)(unsigned int gpio, unsigned int on); | ||
| 18 | }; | ||
| 19 | |||
| 16 | #endif /* __GPIO_PXA_H */ | 20 | #endif /* __GPIO_PXA_H */ |