Convert selectors of GENERIC_GPIO to GPIOLIB

GENERIC_GPIO is now equivalent to GPIOLIB and features that depended on
GENERIC_GPIO can now depend on GPIOLIB to allow removal of this option.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>

3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ac0500667000..772666f7d2ba 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -175,7 +175,7 @@ config KEYBOARD_EP93XX
 
 config KEYBOARD_GPIO
         tristate "GPIO Buttons"
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
         help
           This driver implements support for buttons connected
           to GPIO pins of various CPUs (and some other chips).
@@ -190,7 +190,7 @@ config KEYBOARD_GPIO
 
 config KEYBOARD_GPIO_POLLED
         tristate "Polled GPIO buttons"
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
         select INPUT_POLLDEV
         help
           This driver implements support for buttons connected
@@ -241,7 +241,7 @@ config KEYBOARD_TCA8418
 
 config KEYBOARD_MATRIX
         tristate "GPIO driven matrix keypad support"
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
         select INPUT_MATRIXKMAP
         help
           Enable support for GPIO driven matrix keypad.
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 259ef31abb18..262cda21dcb4 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -214,7 +214,7 @@ config INPUT_APANEL
 config INPUT_GP2A
         tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"
         depends on I2C
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
         help
           Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip
           hooked to an I2C bus.
@@ -224,7 +224,7 @@ config INPUT_GP2A
 
 config INPUT_GPIO_TILT_POLLED
         tristate "Polled GPIO tilt switch"
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
         select INPUT_POLLDEV
         help
           This driver implements support for tilt switches connected
@@ -472,7 +472,7 @@ config INPUT_PWM_BEEPER
 
 config INPUT_GPIO_ROTARY_ENCODER
         tristate "Rotary encoders connected to GPIO pins"
-        depends on GPIOLIB && GENERIC_GPIO
+        depends on GPIOLIB
         help
           Say Y here to add support for rotary encoders connected to GPIO lines.
           Check file:Documentation/input/rotary-encoder.txt for more
@@ -484,7 +484,7 @@ config INPUT_GPIO_ROTARY_ENCODER
 config INPUT_RB532_BUTTON
         tristate "Mikrotik Routerboard 532 button interface"
         depends on MIKROTIK_RB532
-        depends on GPIOLIB && GENERIC_GPIO
+        depends on GPIOLIB
         select INPUT_POLLDEV
         help
           Say Y here if you want support for the S1 button built into
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 802bd6a72d73..effa9c5f2c5c 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -295,7 +295,7 @@ config MOUSE_VSXXXAA
 
 config MOUSE_GPIO
         tristate "GPIO mouse"
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
         select INPUT_POLLDEV
         help
           This driver simulates a mouse on GPIO lines of various CPUs (and some