diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-10 04:03:51 -0400 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 08:07:59 -0500 |
| commit | 4929f5a8a99f64378659c5658621e45c90c2aaa9 (patch) | |
| tree | 37887d8dafda515434896c467d304c04e276889f /arch/arm/plat-pxa | |
| parent | 87c49e20579c933d531a376596875b8fd5dcb04f (diff) | |
ARM: pxa: rename gpio_to_irq and irq_to_gpio
Avoid to define gpio_to_irq() and irq_to_gpio() for potential name
confliction since multiple architecture will be built together.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'arch/arm/plat-pxa')
| -rw-r--r-- | arch/arm/plat-pxa/include/plat/gpio-pxa.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-pxa/include/plat/gpio-pxa.h b/arch/arm/plat-pxa/include/plat/gpio-pxa.h index b6390beff323..15bf9be051e8 100644 --- a/arch/arm/plat-pxa/include/plat/gpio-pxa.h +++ b/arch/arm/plat-pxa/include/plat/gpio-pxa.h | |||
| @@ -40,5 +40,6 @@ extern int pxa_last_gpio; | |||
| 40 | typedef int (*set_wake_t)(struct irq_data *d, unsigned int on); | 40 | typedef int (*set_wake_t)(struct irq_data *d, unsigned int on); |
| 41 | 41 | ||
| 42 | extern void pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn); | 42 | extern void pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn); |
| 43 | extern int pxa_irq_to_gpio(int irq); | ||
| 43 | 44 | ||
| 44 | #endif /* __PLAT_PXA_GPIO_H */ | 45 | #endif /* __PLAT_PXA_GPIO_H */ |