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/littleton.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/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[] = { | |||
124 | .flags = IORESOURCE_MEM, | 124 | .flags = IORESOURCE_MEM, |
125 | }, | 125 | }, |
126 | [1] = { | 126 | [1] = { |
127 | .start = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)), | 127 | .start = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)), |
128 | .end = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)), | 128 | .end = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)), |
129 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE, | 129 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE, |
130 | } | 130 | } |
131 | }; | 131 | }; |