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/include/mach/irqs.h | |
| 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/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 7cc5a781e99e..1f996643b9de 100644 --- a/arch/arm/mach-pxa/include/mach/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h | |||
| @@ -91,7 +91,7 @@ | |||
| 91 | #define PXA_GPIO_IRQ_NUM (192) | 91 | #define PXA_GPIO_IRQ_NUM (192) |
| 92 | 92 | ||
| 93 | #define GPIO_2_x_TO_IRQ(x) (PXA_GPIO_IRQ_BASE + (x)) | 93 | #define GPIO_2_x_TO_IRQ(x) (PXA_GPIO_IRQ_BASE + (x)) |
| 94 | #define IRQ_GPIO(x) (((x) < 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x)) | 94 | #define PXA_GPIO_TO_IRQ(x) (((x) < 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x)) |
| 95 | 95 | ||
| 96 | /* | 96 | /* |
| 97 | * The following interrupts are for board specific purposes. Since | 97 | * The following interrupts are for board specific purposes. Since |