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/cm-x270.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/cm-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 13518a705399..4ebcee5756b1 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | /* GPIO IRQ usage */ | 33 | /* GPIO IRQ usage */ |
| 34 | #define GPIO83_MMC_IRQ (83) | 34 | #define GPIO83_MMC_IRQ (83) |
| 35 | 35 | ||
| 36 | #define CMX270_MMC_IRQ IRQ_GPIO(GPIO83_MMC_IRQ) | 36 | #define CMX270_MMC_IRQ PXA_GPIO_TO_IRQ(GPIO83_MMC_IRQ) |
| 37 | 37 | ||
| 38 | /* MMC power enable */ | 38 | /* MMC power enable */ |
| 39 | #define GPIO105_MMC_POWER (105) | 39 | #define GPIO105_MMC_POWER (105) |