diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-08 01:15:59 -0500 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 08:07:59 -0500 |
| commit | 1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3 (patch) | |
| tree | 4765d57cd3c18a6a24746faec196e660cb4b0385 /arch/arm/mach-pxa/include/mach/gpio.h | |
| parent | 478e223cc39ee98f9f9f0c87cb971a2fe0ce8d12 (diff) | |
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.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/gpio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h index 5cf0137e64d9..561cdbfd7ccf 100644 --- a/arch/arm/mach-pxa/include/mach/gpio.h +++ b/arch/arm/mach-pxa/include/mach/gpio.h | |||
| @@ -28,5 +28,4 @@ | |||
| 28 | /* The defines for the driver are needed for the accelerated accessors */ | 28 | /* The defines for the driver are needed for the accelerated accessors */ |
| 29 | #include "gpio-pxa.h" | 29 | #include "gpio-pxa.h" |
| 30 | 30 | ||
| 31 | #include <plat/gpio.h> | ||
| 32 | #endif | 31 | #endif |