From c8846ce54d1260eb1c58c04b847c192a51fd027a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20St=C3=BCbner?= <heiko@sntech.de>
Date: Tue, 11 Oct 2011 23:11:01 +0200
Subject: [PATCH] --- yaml --- r: 272416 b: refs/heads/master c:
 d162b3c54b206ee64c87651309ed4442846cafbc h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/regulator/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index db82328d4c8e..9808e05eebc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecc37edf7b670616a9dc78a0bdd4911a22d551ec
+refs/heads/master: d162b3c54b206ee64c87651309ed4442846cafbc
diff --git a/trunk/drivers/regulator/Kconfig b/trunk/drivers/regulator/Kconfig
index 5e0c7b664732..9713b1b860cb 100644
--- a/trunk/drivers/regulator/Kconfig
+++ b/trunk/drivers/regulator/Kconfig
@@ -66,6 +66,7 @@ config REGULATOR_USERSPACE_CONSUMER
 
 config REGULATOR_GPIO
 	tristate "GPIO regulator support"
+	depends on GENERIC_GPIO
 	help
 	  This driver provides support for regulators that can be
 	  controlled via gpios.