summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/am300epd.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-10-10 10:21:08 +0400
committerHaojian Zhuang <haojian.zhuang@marvell.com>2011-11-14 17:07:58 +0400
commit6384fdadb48a875bcc1c0f58933275f15f409b76 (patch)
treed9416a0d9e3d9654939aa85fc515f7336dec5893 /arch/arm/mach-pxa/am300epd.c
parent31555213f03bca37d2c02e10946296052f4ecfcd (diff)
downloadlinux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.xz
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/am300epd.c')
-rw-r--r--arch/arm/mach-pxa/am300epd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c
index fa8bad235d9f..76c4b9494031 100644
--- a/arch/arm/mach-pxa/am300epd.c
+++ b/arch/arm/mach-pxa/am300epd.c
@@ -176,7 +176,7 @@ static void am300_cleanup(struct broadsheetfb_par *par)
{
int i;
- free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);
+ free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);
for (i = 0; i < ARRAY_SIZE(gpios); i++)
gpio_free(gpios[i]);
@@ -240,7 +240,7 @@ static int am300_setup_irq(struct fb_info *info)
int ret;
struct broadsheetfb_par *par = info->par;
- ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am300_handle_irq,
+ ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am300_handle_irq,
IRQF_DISABLED|IRQF_TRIGGER_RISING,
"AM300", par);
if (ret)