diff options
Diffstat (limited to 'arch/arm/mach-pxa/vpac270.c')
-rw-r--r-- | arch/arm/mach-pxa/vpac270.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c index fed5fb088714..1f5cfa96f6d6 100644 --- a/arch/arm/mach-pxa/vpac270.c +++ b/arch/arm/mach-pxa/vpac270.c | |||
@@ -395,8 +395,8 @@ static struct resource vpac270_dm9000_resources[] = { | |||
395 | .flags = IORESOURCE_MEM, | 395 | .flags = IORESOURCE_MEM, |
396 | }, | 396 | }, |
397 | [2] = { | 397 | [2] = { |
398 | .start = IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ), | 398 | .start = PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ), |
399 | .end = IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ), | 399 | .end = PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ), |
400 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, | 400 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
401 | }, | 401 | }, |
402 | }; | 402 | }; |
@@ -433,7 +433,7 @@ static pxa2xx_audio_ops_t vpac270_ac97_pdata = { | |||
433 | }; | 433 | }; |
434 | 434 | ||
435 | static struct ucb1400_pdata vpac270_ucb1400_pdata = { | 435 | static struct ucb1400_pdata vpac270_ucb1400_pdata = { |
436 | .irq = IRQ_GPIO(GPIO113_VPAC270_TS_IRQ), | 436 | .irq = PXA_GPIO_TO_IRQ(GPIO113_VPAC270_TS_IRQ), |
437 | }; | 437 | }; |
438 | 438 | ||
439 | static struct platform_device vpac270_ucb1400_device = { | 439 | static struct platform_device vpac270_ucb1400_device = { |
@@ -610,8 +610,8 @@ static struct resource vpac270_ide_resources[] = { | |||
610 | .flags = IORESOURCE_DMA | 610 | .flags = IORESOURCE_DMA |
611 | }, | 611 | }, |
612 | [3] = { /* IDE IRQ pin */ | 612 | [3] = { /* IDE IRQ pin */ |
613 | .start = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ), | 613 | .start = PXA_GPIO_TO_IRQ(GPIO36_VPAC270_IDE_IRQ), |
614 | .end = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ), | 614 | .end = PXA_GPIO_TO_IRQ(GPIO36_VPAC270_IDE_IRQ), |
615 | .flags = IORESOURCE_IRQ | 615 | .flags = IORESOURCE_IRQ |
616 | } | 616 | } |
617 | }; | 617 | }; |