diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-10 08:21:08 +0200 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 14:07:58 +0100 |
| commit | 6384fdadb48a875bcc1c0f58933275f15f409b76 (patch) | |
| tree | d9416a0d9e3d9654939aa85fc515f7336dec5893 /arch/arm/mach-pxa/littleton.c | |
| parent | Revert "hvc_console: display printk messages on console." (diff) | |
| download | linux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.xz linux-6384fdadb48a875bcc1c0f58933275f15f409b76.zip | |
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/littleton.c')
| -rw-r--r-- | arch/arm/mach-pxa/littleton.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index 0037e57e0cec..9cd235698771 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c @@ -124,8 +124,8 @@ static struct resource smc91x_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)), - .end = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)), + .start = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)), + .end = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)), .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE, } }; |