diff --git a/[refs] b/[refs]
index 4d3ddd752c23..40c92fb07295 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7ea2dc59ed46dcd0f1cfaccda02211f4507207b
+refs/heads/master: bef3e20c9f8ce5cb8809cf33494d95a78db07857
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index ea2557bb0bd4..a760dbefd27a 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -80,7 +80,7 @@ config HTC_PASIC3
 
 config HTC_I2CPLD
 	bool "HTC I2C PLD chip support"
-	depends on I2C=y
+	depends on I2C=y && GPIOLIB
 	help
 	  If you say yes here you get support for the supposed CPLD
 	  found on omap850 HTC devices like the HTC Wizard and HTC Herald.