diff options
| -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 003b7d00dd60..dbd2cb19924a 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 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 @@ #include <linux/kernel.h> #include <linux/errno.h> - -#define ARCH_NR_GPIOS 1024 #include <linux/sh_pfc.h> #ifdef CONFIG_GPIOLIB |