summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach/gpio-pxa.h
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-11-08 14:15:59 +0800
committerHaojian Zhuang <haojian.zhuang@marvell.com>2011-11-14 21:07:59 +0800
commit1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3 (patch)
tree4765d57cd3c18a6a24746faec196e660cb4b0385 /arch/arm/mach-pxa/include/mach/gpio-pxa.h
parent478e223cc39ee98f9f9f0c87cb971a2fe0ce8d12 (diff)
downloadtalos-op-linux-1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3.tar.gz
talos-op-linux-1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3.zip
ARM: pxa: rename NR_BUILTIN_GPIO
NR_BUILTIN_GPIO is both defined in arch-pxa and arch-mmp. Now replace it with PXA_NR_BUILTIN_GPIO and MMP_NR_BUILTIN_GPIO. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/gpio-pxa.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/gpio-pxa.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/gpio-pxa.h b/arch/arm/mach-pxa/include/mach/gpio-pxa.h
index 41b4c93a96c2..134b3bc332cd 100644
--- a/arch/arm/mach-pxa/include/mach/gpio-pxa.h
+++ b/arch/arm/mach-pxa/include/mach/gpio-pxa.h
@@ -93,8 +93,6 @@
#define GAFR(x) GPIO_REG(0x54 + (((x) & 0x70) >> 2))
-#define NR_BUILTIN_GPIO PXA_GPIO_IRQ_NUM
-
#define gpio_to_bank(gpio) ((gpio) >> 5)
#ifdef CONFIG_CPU_PXA26x
OpenPOWER on IntegriCloud