Home » Mailing list archives » git-commits-head » 2009 » March » 26

sh: mach-highlander and mach-rsk require gpiolib.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Linux Kernel Mailing List
Subject: sh: mach-highlander and mach-rsk require gpiolib.
Date: Thursday, March 26, 2009 - 12:20 pm

Gitweb:     http://git.kernel.org/linus/ae5e6d05a606e05e054f816bd01e02f69d38d283
Commit:     ae5e6d05a606e05e054f816bd01e02f69d38d283
Parent:     57e97cb8bedd06e8a2e562454423d58aab5827ce
Author:     Paul Mundt <lethal@linux-sh.org>
AuthorDate: Wed Jan 7 17:16:25 2009 +0900
Committer:  Paul Mundt <lethal@linux-sh.org>
CommitDate: Tue Jan 27 14:49:10 2009 +0900

    sh: mach-highlander and mach-rsk require gpiolib.
    
    Fix up the build for mach-highlander and mach-rsk. These operated on the
    assumption that GENERIC_GPIO support with an optional GPIOLIB was
    possible. This used to be true, but has not been the case since commit-id
    d56cc8bc661ac1ceded8d45ba2d53bb134fee17d ("sh: use gpiolib"), where the
    GENERIC_GPIO implementation was rewritten to use GPIOLIB directly.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
 arch/sh/Kconfig                        |    7 -------
 arch/sh/boards/Kconfig                 |    2 +-
 arch/sh/boards/mach-highlander/Kconfig |    2 +-
 arch/sh/boards/mach-rsk/Kconfig        |    2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3a2be22..ebabe51 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -126,13 +126,6 @@ config ARCH_HAS_ILOG2_U64
 config ARCH_NO_VIRT_TO_BUS
 	def_bool y
 
-config ARCH_WANT_OPTIONAL_GPIOLIB
-	def_bool y
-	depends on !ARCH_REQUIRE_GPIOLIB
-
-config ARCH_REQUIRE_GPIOLIB
-	def_bool n
-
 config IO_TRAPPED
 	bool
 
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 802d5c4..c9da370 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -240,7 +240,7 @@ config SH_X3PROTO
 config SH_MAGIC_PANEL_R2
 	bool "Magic Panel R2"
 	depends on CPU_SUBTYPE_SH7720
-	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
 	help
 	  Select Magic Panel R2 if configuring for Magic Panel R2.
 
diff --git a/arch/sh/boards/mach-highlander/Kconfig b/arch/sh/boards/mach-highlander/Kconfig
index 08057f6..def49cc 100644
--- a/arch/sh/boards/mach-highlander/Kconfig
+++ b/arch/sh/boards/mach-highlander/Kconfig
@@ -18,7 +18,7 @@ config SH_R7780MP
 config SH_R7785RP
 	bool "R7785RP board support"
 	depends on CPU_SUBTYPE_SH7785
-	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
 
 endchoice
 
diff --git a/arch/sh/boards/mach-rsk/Kconfig b/arch/sh/boards/mach-rsk/Kconfig
index bff095d..aeff3b0 100644
--- a/arch/sh/boards/mach-rsk/Kconfig
+++ b/arch/sh/boards/mach-rsk/Kconfig
@@ -10,7 +10,7 @@ config SH_RSK7201
 
 config SH_RSK7203
 	bool "RSK7203"
-	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
 	depends on CPU_SUBTYPE_SH7203
 
 endchoice
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
sh: mach-highlander and mach-rsk require gpiolib., Linux Kernel Mailing ..., (Thu Mar 26, 12:20 pm)