aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter De Schrijver (NVIDIA) <pdeschrijver@nvidia.com>2011-12-21 09:14:52 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-23 17:54:51 -0500
commit3dea19e826da3dd43b3dc308aca299c0b7263c6b (patch)
tree0c842b4050832be5cd1a91f2b8bf0666d7ec2e1e
parent44986ab056076e9dc9fb9f8b4729afef7fa72616 (diff)
ARM: 7244/1: mach-shmobile: Use CONFIG_ARCH_NR_GPIO
Add default value for CONFIG_ARCH_NR_GPIO to Kconfig and remove the definition in gpio.h. Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/mach-shmobile/include/mach/gpio.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 003b7d00dd60..dbd2cb19924a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1567,7 +1567,7 @@ config LOCAL_TIMERS
1567 1567
1568config ARCH_NR_GPIO 1568config ARCH_NR_GPIO
1569 int 1569 int
1570 default 1024 if ARCH_TEGRA 1570 default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
1571 default 0 1571 default 0
1572 help 1572 help
1573 Maximum number of GPIOs in the system. 1573 Maximum number of GPIOs in the system.
diff --git a/arch/arm/mach-shmobile/include/mach/gpio.h b/arch/arm/mach-shmobile/include/mach/gpio.h
index 7bf0890e16ba..de795b42232a 100644
--- a/arch/arm/mach-shmobile/include/mach/gpio.h
+++ b/arch/arm/mach-shmobile/include/mach/gpio.h
@@ -12,8 +12,6 @@
12 12
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/errno.h> 14#include <linux/errno.h>
15
16#define ARCH_NR_GPIOS 1024
17#include <linux/sh_pfc.h> 15#include <linux/sh_pfc.h>
18 16
19#ifdef CONFIG_GPIOLIB 17#ifdef CONFIG_GPIOLIB