diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-10 02:21:08 -0400 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 08:07:58 -0500 |
commit | 6384fdadb48a875bcc1c0f58933275f15f409b76 (patch) | |
tree | d9416a0d9e3d9654939aa85fc515f7336dec5893 /arch/arm/mach-pxa/mainstone.c | |
parent | 31555213f03bca37d2c02e10946296052f4ecfcd (diff) |
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.c | 4 |
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) | |||
178 | MST_INTMSKENA = 0; | 178 | MST_INTMSKENA = 0; |
179 | MST_INTSETCLR = 0; | 179 | MST_INTSETCLR = 0; |
180 | 180 | ||
181 | irq_set_chained_handler(IRQ_GPIO(0), mainstone_irq_handler); | 181 | irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), mainstone_irq_handler); |
182 | irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING); | 182 | irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING); |
183 | } | 183 | } |
184 | 184 | ||
185 | #ifdef CONFIG_PM | 185 | #ifdef CONFIG_PM |