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

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 8a77b0a937a589a5464d56773d17e4ea1d44acb5..37c4bd1cacd579bfe66523bc5f371d00af1969b4 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -70,7 +70,7 @@ config GPIO_GENERIC
 
 config GPIO_DA9052
        tristate "Dialog DA9052 GPIO"
-       depends on PMIC_DA9052
+       depends on PMIC_DA9052 && BROKEN
        help
          Say yes here to enable the GPIO driver for the DA9052 chip.
 
@@ -142,6 +142,12 @@ config GPIO_PL061
        help
          Say yes here to support the PrimeCell PL061 GPIO device
 
+config GPIO_PXA
+       bool "PXA GPIO support"
+       depends on ARCH_PXA || ARCH_MMP
+       help
+         Say yes here to support the PXA GPIO device
+
 config GPIO_XILINX
        bool "Xilinx GPIO support"
        depends on PPC_OF || MICROBLAZE
@@ -171,15 +177,6 @@ config GPIO_SCH
          The Intel Tunnel Creek processor has 5 GPIOs powered by the
          core power rail and 9 from suspend power supply.
 
-config GPIO_U300
-       bool "ST-Ericsson U300 COH 901 335/571 GPIO"
-       depends on GPIOLIB && ARCH_U300
-       help
-         Say yes here to support GPIO interface on ST-Ericsson U300.
-         The names of the two IP block variants supported are
-         COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
-         ports of 8 GPIO pins each.
-
 config GPIO_VX855
        tristate "VIA VX855/VX875 GPIO"
        depends on PCI
@@ -357,7 +354,7 @@ comment "PCI GPIO expanders:"
 
 config GPIO_CS5535
        tristate "AMD CS5535/CS5536 GPIO support"
-       depends on PCI && X86 && !CS5535_GPIO && MFD_CS5535
+       depends on PCI && X86 && MFD_CS5535
        help
          The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
          can be used for quite a number of things.  The CS5535/6 is found on