diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-08 14:15:59 +0800 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 21:07:59 +0800 |
commit | 1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3 (patch) | |
tree | 4765d57cd3c18a6a24746faec196e660cb4b0385 /arch/arm/mach-pxa/include/mach/hx4700.h | |
parent | 478e223cc39ee98f9f9f0c87cb971a2fe0ce8d12 (diff) | |
download | linux-1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3.tar.bz2 |
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/hx4700.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/hx4700.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h index 37408449ec25..8bc02913517c 100644 --- a/arch/arm/mach-pxa/include/mach/hx4700.h +++ b/arch/arm/mach-pxa/include/mach/hx4700.h @@ -15,7 +15,7 @@ #include <linux/gpio.h> #include <linux/mfd/asic3.h> -#define HX4700_ASIC3_GPIO_BASE NR_BUILTIN_GPIO +#define HX4700_ASIC3_GPIO_BASE PXA_NR_BUILTIN_GPIO #define HX4700_EGPIO_BASE (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS) #define HX4700_NR_IRQS (IRQ_BOARD_START + 70) |