summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/mainstone.c
diff options
context:
space:
mode:
authorHaojian Zhuang2011-10-10 08:21:08 +0200
committerHaojian Zhuang2011-11-14 14:07:58 +0100
commit6384fdadb48a875bcc1c0f58933275f15f409b76 (patch)
treed9416a0d9e3d9654939aa85fc515f7336dec5893 /arch/arm/mach-pxa/mainstone.c
parentRevert "hvc_console: display printk messages on console." (diff)
downloadkernel-qcow2-linux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.gz
kernel-qcow2-linux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.xz
kernel-qcow2-linux-6384fdadb48a875bcc1c0f58933275f15f409b76.zip
ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ
Avoid potential naming confliction since multiple architecture will be built in a single kernel. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
-rw-r--r--arch/arm/mach-pxa/mainstone.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 0567d3965fda..ea62a990ae4b 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -178,8 +178,8 @@ static void __init mainstone_init_irq(void)
MST_INTMSKENA = 0;
MST_INTSETCLR = 0;
- irq_set_chained_handler(IRQ_GPIO(0), mainstone_irq_handler);
- irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
+ irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), mainstone_irq_handler);
+ irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);
}
#ifdef CONFIG_PM