Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[platform/upstream/kernel-adaptation-pc.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index ab97eb8..93aaadf 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -69,7 +69,7 @@ config DEBUG_GPIO
 
 config GPIO_SYSFS
        bool "/sys/class/gpio/... (sysfs interface)"
-       depends on SYSFS && EXPERIMENTAL
+       depends on SYSFS
        help
          Say Y here to add a sysfs interface for GPIOs.
 
@@ -280,7 +280,7 @@ config GPIO_ICH
 
 config GPIO_VX855
        tristate "VIA VX855/VX875 GPIO"
-       depends on PCI
+       depends on PCI && GENERIC_HARDIRQS
        select MFD_CORE
        select MFD_VX855
        help
@@ -610,7 +610,7 @@ config GPIO_TIMBERDALE
 
 config GPIO_RDC321X
        tristate "RDC R-321x GPIO support"
-       depends on PCI
+       depends on PCI && GENERIC_HARDIRQS
        select MFD_CORE
        select MFD_RDC321X
        help
@@ -668,11 +668,12 @@ config GPIO_JANZ_TTL
          This driver provides support for driving the pins in output
          mode only. Input mode is not supported.
 
-config GPIO_AB8500
-       bool "ST-Ericsson AB8500 Mixed Signal Circuit gpio functions"
-       depends on AB8500_CORE && BROKEN
+config GPIO_PALMAS
+       bool "TI PALMAS series PMICs GPIO"
+       depends on MFD_PALMAS
        help
-         Select this to enable the AB8500 IC GPIO driver
+         Select this option to enable GPIO driver for the TI PALMAS
+         series chip family.
 
 config GPIO_TPS6586X
        bool "TPS6586X GPIO"