diff options
| author | Peter De Schrijver (NVIDIA) <pdeschrijver@nvidia.com> | 2011-12-21 15:14:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-23 22:54:51 +0000 |
| commit | 3dea19e826da3dd43b3dc308aca299c0b7263c6b (patch) | |
| tree | 0c842b4050832be5cd1a91f2b8bf0666d7ec2e1e | |
| parent | 44986ab056076e9dc9fb9f8b4729afef7fa72616 (diff) | |
| download | op-kernel-dev-3dea19e826da3dd43b3dc308aca299c0b7263c6b.zip op-kernel-dev-3dea19e826da3dd43b3dc308aca299c0b7263c6b.tar.gz | |
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/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/gpio.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 003b7d0..dbd2cb1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1567,7 +1567,7 @@ config LOCAL_TIMERS config ARCH_NR_GPIO int - default 1024 if ARCH_TEGRA + default 1024 if ARCH_SHMOBILE || ARCH_TEGRA default 0 help 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 7bf0890..de795b4 100644 --- a/arch/arm/mach-shmobile/include/mach/gpio.h +++ b/arch/arm/mach-shmobile/include/mach/gpio.h @@ -12,8 +12,6 @@ #include <linux/kernel.h> #include <linux/errno.h> - -#define ARCH_NR_GPIOS 1024 #include <linux/sh_pfc.h> #ifdef CONFIG_GPIOLIB |
