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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 003b7d00dd60612adf5ef3cd8f2fefe599b4f2ba..dbd2cb19924a34cca065bcb0c4d3cf2d0765ca07 100644 (file)
--- 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 7bf0890e16ba43963171bf5dea4b3345c27e25d8..de795b42232a8940720ed8e44ca3bc7da7431372 100644 (file)
--- 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