summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/include/mach/gpio.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-mmp/include/mach/gpio.h
parent478e223cc39ee98f9f9f0c87cb971a2fe0ce8d12 (diff)
downloadop-kernel-dev-1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3.zip
op-kernel-dev-1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3.tar.gz
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-mmp/include/mach/gpio.h')
-rw-r--r--arch/arm/mach-mmp/include/mach/gpio.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/gpio.h b/arch/arm/mach-mmp/include/mach/gpio.h
index 32b684a..904466d 100644
--- a/arch/arm/mach-mmp/include/mach/gpio.h
+++ b/arch/arm/mach-mmp/include/mach/gpio.h
@@ -6,5 +6,4 @@
#define __gpio_is_inverted(gpio) (0)
#define __gpio_is_occupied(gpio) (0)
-#include <plat/gpio.h>
#endif /* __ASM_MACH_GPIO_H */
OpenPOWER on IntegriCloud