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>
This commit is contained in:
@@ -395,8 +395,8 @@ static struct resource vpac270_dm9000_resources[] = {
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[2] = {
|
||||
.start = IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ),
|
||||
.end = IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ),
|
||||
.start = PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ),
|
||||
.end = PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ),
|
||||
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
|
||||
},
|
||||
};
|
||||
@@ -433,7 +433,7 @@ static pxa2xx_audio_ops_t vpac270_ac97_pdata = {
|
||||
};
|
||||
|
||||
static struct ucb1400_pdata vpac270_ucb1400_pdata = {
|
||||
.irq = IRQ_GPIO(GPIO113_VPAC270_TS_IRQ),
|
||||
.irq = PXA_GPIO_TO_IRQ(GPIO113_VPAC270_TS_IRQ),
|
||||
};
|
||||
|
||||
static struct platform_device vpac270_ucb1400_device = {
|
||||
|
Reference in New Issue
Block a user