Merge branch 'sh/hwblk' into sh-latest

[~andy/linux] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 4e04157a36831d993ad7174c4220a7492b46b958..5099681cf503c53917311bb6de338ec4708316cf 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.
 
@@ -356,7 +356,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