diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-10 16:03:51 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 21:07:59 +0800 |
| commit | 4929f5a8a99f64378659c5658621e45c90c2aaa9 (patch) | |
| tree | 37887d8dafda515434896c467d304c04e276889f /arch/arm/mach-mmp/aspenite.c | |
| 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/mach-mmp/aspenite.c')
| -rw-r--r-- | arch/arm/mach-mmp/aspenite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index 06b5ad77460..fb7dfc157a5 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c @@ -120,8 +120,8 @@ static struct resource smc91x_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = gpio_to_irq(27), - .end = gpio_to_irq(27), + .start = MMP_GPIO_TO_IRQ(27), + .end = MMP_GPIO_TO_IRQ(27), .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, } }; |