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/am200epd.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/am200epd.c')
-rw-r--r-- | arch/arm/mach-pxa/am200epd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c index 4cb069fd9af2..ccdac4b6a469 100644 --- a/arch/arm/mach-pxa/am200epd.c +++ b/arch/arm/mach-pxa/am200epd.c | |||
@@ -138,7 +138,7 @@ static void am200_cleanup(struct metronomefb_par *par) | |||
138 | { | 138 | { |
139 | int i; | 139 | int i; |
140 | 140 | ||
141 | free_irq(IRQ_GPIO(RDY_GPIO_PIN), par); | 141 | free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par); |
142 | 142 | ||
143 | for (i = 0; i < ARRAY_SIZE(gpios); i++) | 143 | for (i = 0; i < ARRAY_SIZE(gpios); i++) |
144 | gpio_free(gpios[i]); | 144 | gpio_free(gpios[i]); |
@@ -292,7 +292,7 @@ static int am200_setup_irq(struct fb_info *info) | |||
292 | { | 292 | { |
293 | int ret; | 293 | int ret; |
294 | 294 | ||
295 | ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq, | 295 | ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am200_handle_irq, |
296 | IRQF_DISABLED|IRQF_TRIGGER_FALLING, | 296 | IRQF_DISABLED|IRQF_TRIGGER_FALLING, |
297 | "AM200", info->par); | 297 | "AM200", info->par); |
298 | if (ret) | 298 | if (ret) |