summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/poodle.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-10-10 12:03:51 +0400
committerHaojian Zhuang <haojian.zhuang@marvell.com>2011-11-14 17:07:59 +0400
commit4929f5a8a99f64378659c5658621e45c90c2aaa9 (patch)
tree37887d8dafda515434896c467d304c04e276889f /arch/arm/mach-pxa/poodle.c
parent87c49e20579c933d531a376596875b8fd5dcb04f (diff)
downloadlinux-4929f5a8a99f64378659c5658621e45c90c2aaa9.tar.xz
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-pxa/poodle.c')
-rw-r--r--arch/arm/mach-pxa/poodle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 1e6d796829ac..8ee4b6cfa385 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -212,7 +212,7 @@ static struct spi_board_info poodle_spi_devices[] = {
.bus_num = 1,
.platform_data = &poodle_ads7846_info,
.controller_data= &poodle_ads7846_chip,
- .irq = gpio_to_irq(POODLE_GPIO_TP_INT),
+ .irq = PXA_GPIO_TO_IRQ(POODLE_GPIO_TP_INT),
},
};