diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-10 14:21:08 +0800 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 21:07:58 +0800 |
commit | 6384fdadb48a875bcc1c0f58933275f15f409b76 (patch) | |
tree | d9416a0d9e3d9654939aa85fc515f7336dec5893 /arch/arm/mach-pxa/include/mach/gpio.h | |
parent | 31555213f03bca37d2c02e10946296052f4ecfcd (diff) | |
download | linux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.gz linux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.bz2 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/include/mach/gpio.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/gpio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h index 004cade7bb13..07fa3ba7a818 100644 --- a/arch/arm/mach-pxa/include/mach/gpio.h +++ b/arch/arm/mach-pxa/include/mach/gpio.h @@ -28,7 +28,7 @@ /* The defines for the driver are needed for the accelerated accessors */ #include "gpio-pxa.h" -#define gpio_to_irq(gpio) IRQ_GPIO(gpio) +#define gpio_to_irq(gpio) PXA_GPIO_TO_IRQ(gpio) static inline int irq_to_gpio(unsigned int irq) { |