projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44986ab)
ARM: 7244/1: mach-shmobile: Use CONFIG_ARCH_NR_GPIO
authorPeter De Schrijver (NVIDIA) <pdeschrijver@nvidia.com>
Wed, 21 Dec 2011 14:14:52 +0000 (15:14 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 23 Dec 2011 22:54:51 +0000 (22:54 +0000)
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>
arch/arm/Kconfig patch | blob | history
arch/arm/mach-shmobile/include/mach/gpio.h patch | blob | history

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 003b7d0..dbd2cb1 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 7bf0890..de795b4 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
Domain: System / Uncategorized;