aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/tavorevb.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-10-10 04:03:51 -0400
committerHaojian Zhuang <haojian.zhuang@marvell.com>2011-11-14 08:07:59 -0500
commit4929f5a8a99f64378659c5658621e45c90c2aaa9 (patch)
tree37887d8dafda515434896c467d304c04e276889f /arch/arm/mach-mmp/tavorevb.c
parent87c49e20579c933d531a376596875b8fd5dcb04f (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/tavorevb.c')
-rw-r--r--arch/arm/mach-mmp/tavorevb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c
index eb5be879fd8c..0afe3a39982f 100644
--- a/arch/arm/mach-mmp/tavorevb.c
+++ b/arch/arm/mach-mmp/tavorevb.c
@@ -71,8 +71,8 @@ static struct resource smc91x_resources[] = {
71 .flags = IORESOURCE_MEM, 71 .flags = IORESOURCE_MEM,
72 }, 72 },
73 [1] = { 73 [1] = {
74 .start = gpio_to_irq(80), 74 .start = MMP_GPIO_TO_IRQ(80),
75 .end = gpio_to_irq(80), 75 .end = MMP_GPIO_TO_IRQ(80),
76 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, 76 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
77 } 77 }
78}; 78};