浏览代码

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>
Peter De Schrijver (NVIDIA) 13 年之前
父节点
当前提交
3dea19e826
共有 2 个文件被更改,包括 1 次插入3 次删除
  1. 1 1
      arch/arm/Kconfig
  2. 0 2
      arch/arm/mach-shmobile/include/mach/gpio.h

+ 1 - 1
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.

+ 0 - 2
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