From 7dfac08d2f16d1f9c7c1bdec1580f33a5f58cca9 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 20 Jun 2012 18:17:56 +0900
Subject: [PATCH] --- yaml --- r: 313759 b: refs/heads/master c:
 b16b2a262c234d6abd8899d41769278337fff5b5 h: refs/heads/master i:   313757:
 da783e9f732da75f9531cd6298014874be5f1697   313755:
 fee7e081ca612a7e31ed6a00e203cac1cd2877f5   313751:
 7a1edd6a0864a2993a4d5081df0d4bc79ff27aa8   313743:
 63ca38fa0fdb86ad763283919301c75dabf44fdd   313727:
 c06015873fdd14a4ca323834c52b14795537ee36 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/sh/Kconfig  | 15 +++++++++++++++
 trunk/drivers/sh/Makefile |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 67cc0f1d3c29..e299f9197ae1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c185a7614cd95ea9b68d89a8d1ee4227ee9018
+refs/heads/master: b16b2a262c234d6abd8899d41769278337fff5b5
diff --git a/trunk/drivers/sh/Kconfig b/trunk/drivers/sh/Kconfig
index f168a6159961..d7dbfee1bc70 100644
--- a/trunk/drivers/sh/Kconfig
+++ b/trunk/drivers/sh/Kconfig
@@ -2,4 +2,19 @@ menu "SuperH / SH-Mobile Driver Options"
 
 source "drivers/sh/intc/Kconfig"
 
+comment "Pin function controller options"
+
+config SH_PFC
+	# XXX move off the gpio dependency
+	depends on GENERIC_GPIO
+	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
+	def_bool y
+
+config GPIO_SH_PFC
+	tristate "SuperH PFC GPIO support"
+	depends on SH_PFC && GPIOLIB
+	help
+	  This enables support for GPIOs within the SoC's pin function
+	  controller.
+
 endmenu
diff --git a/trunk/drivers/sh/Makefile b/trunk/drivers/sh/Makefile
index be5b2934f067..f5d93e8de090 100644
--- a/trunk/drivers/sh/Makefile
+++ b/trunk/drivers/sh/Makefile
@@ -6,5 +6,6 @@ obj-y	:= intc/
 obj-$(CONFIG_HAVE_CLK)		+= clk/
 obj-$(CONFIG_MAPLE)		+= maple/
 obj-$(CONFIG_SUPERHYWAY)	+= superhyway/
-obj-$(CONFIG_GENERIC_GPIO)	+= pfc.o pfc-gpio.o
+obj-$(CONFIG_SH_PFC)		+= pfc.o
+obj-$(CONFIG_GPIO_SH_PFC)	+= pfc-gpio.o
 obj-y				+= pm_runtime.o