summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach/gpio.h
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-10-10 16:03:51 +0800
committerHaojian Zhuang <haojian.zhuang@marvell.com>2011-11-14 21:07:59 +0800
commit4929f5a8a99f64378659c5658621e45c90c2aaa9 (patch)
tree37887d8dafda515434896c467d304c04e276889f /arch/arm/mach-pxa/include/mach/gpio.h
parent87c49e20579c933d531a376596875b8fd5dcb04f (diff)
downloadtalos-obmc-linux-4929f5a8a99f64378659c5658621e45c90c2aaa9.tar.gz
talos-obmc-linux-4929f5a8a99f64378659c5658621e45c90c2aaa9.zip
ARM: pxa: rename gpio_to_irq and irq_to_gpio
Avoid to define gpio_to_irq() and irq_to_gpio() for potential name confliction since multiple architecture will be built together. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/gpio.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/gpio.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h
index 13b903907087..5cf0137e64d9 100644
--- a/arch/arm/mach-pxa/include/mach/gpio.h
+++ b/arch/arm/mach-pxa/include/mach/gpio.h
@@ -28,8 +28,5 @@
/* The defines for the driver are needed for the accelerated accessors */
#include "gpio-pxa.h"
-#define gpio_to_irq(gpio) PXA_GPIO_TO_IRQ(gpio)
-#define irq_to_gpio(irq) (irq - PXA_GPIO_TO_IRQ(0))
-
#include <plat/gpio.h>
#endif
OpenPOWER on IntegriCloud