diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
| commit | 37d7035da5b1f184c610b038b376c0c647d8d72b (patch) | |
| tree | c38d4058ad3232f985d9ed4501a8a842a2a47028 /include/asm-arm/arch-pxa/mfp-pxa2xx.h | |
| parent | 0fc3ff31f1f0fa023bb61e9336a7aa3591f2dffe (diff) | |
| parent | 54b238469bce3a1b5012b2f0ebf261cf1c53e664 (diff) | |
Merge branch 'pxa-devel' into pxa
Diffstat (limited to 'include/asm-arm/arch-pxa/mfp-pxa2xx.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/mfp-pxa2xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/mfp-pxa2xx.h b/include/asm-arm/arch-pxa/mfp-pxa2xx.h index db8d890d237c..8de1c0dae624 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa2xx.h +++ b/include/asm-arm/arch-pxa/mfp-pxa2xx.h | |||
| @@ -128,5 +128,6 @@ | |||
| 128 | #define GPIO84_GPIO MFP_CFG_IN(GPIO84, AF0) | 128 | #define GPIO84_GPIO MFP_CFG_IN(GPIO84, AF0) |
| 129 | 129 | ||
| 130 | extern void pxa2xx_mfp_config(unsigned long *mfp_cfgs, int num); | 130 | extern void pxa2xx_mfp_config(unsigned long *mfp_cfgs, int num); |
| 131 | extern void pxa2xx_mfp_set_lpm(int mfp, unsigned long lpm); | ||
| 131 | extern int gpio_set_wake(unsigned int gpio, unsigned int on); | 132 | extern int gpio_set_wake(unsigned int gpio, unsigned int on); |
| 132 | #endif /* __ASM_ARCH_MFP_PXA2XX_H */ | 133 | #endif /* __ASM_ARCH_MFP_PXA2XX_H */ |