[PATCH] merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOL=

[Stephen Rothwell]

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/i2c/muxes/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index b5329b0..f7f9865 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -7,7 +7,7 @@ menu "Multiplexer I2C Chip support"
=20
 config I2C_ARB_GPIO_CHALLENGE
 	tristate "GPIO-based I2C arbitration"
-	depends on GENERIC_GPIO && OF
+	depends on GPIOLIB && OF
 	help
 	  If you say yes to this option, support will be included for an
 	  I2C multimaster arbitration scheme using GPIOs and a challenge &
--=20
1.8.1


--Multipart=_Fri__3_May_2013_10_52_34_+1000_9GFY2zDGQ=6K_NpQ--

--Signature=_Fri__3_May_2013_10_52_34_+1000_nnMr/o.tVyfM5eC7
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJRgwpSAAoJEECxmPOUX5FEOvMP/jTqmN8/fkwXCRKAcGKpbd9i
Cews5cLYbCiish/IL2O+zIETU3eVAF1kpsnjtzmfcF2m6UU8ua5GH5vxNBK8+nBc
BbF2zeBdqZp/Bu38eNEEUyx+6U7og+tjusX0/GkNjbbCy0OCYaHxealvNcKN2/xV
8JPMvm4CmE+Dq+2lY9wlXyqd8POgWEkJkkVauyI8Esv6GrAMa780+hUdUz+2Wzma
HJ8EX5XNho4kN4p5leMHKbVG2YuVzjx5Ki3J2ESfEMBFY9wXSCyQIJI/ze0XTn8G
srjZ7dYjM9R5C1BHQjp1/nmEcCcioJDvrpzOvGGb3BikOEYCh5V2IsJ9gkMgYUpV
ehh1SdCa6M3C1v5wRf6abJr41GL070yDBqx+Rh+43cd585RyVifoo4Sqsljpfsk0
DBrrBeU8p8lur4YvRrV7dhrarunAkWchZMzuFPSY3TlnNn6j4ulg42guLkRrZ+qH
D9FH/zoKS9wkj/xhu/hu3to7PbfKYDMAamQq/eEVeqtHF/gzRYMk/n9Ss8uacQZG
EUwNVl+aF3fqcrG8QNIvCmd/Whv4QlRdlyyuc9Fjf7DYImW0ODWzVe9fhcCuNm2B
F4M7xYC7GAFitUJudM8MGMSHY2ieXmbGnGbH97VAj6vybDBZqJKRzOMAF5RRp6Zz
4fQOMF1JHa8PnK35v0XI
=2dlw
-----END PGP SIGNATURE-----

--Signature=_Fri__3_May_2013_10_52_34_+1000_nnMr/o.tVyfM5eC7--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/