Merge tag 'for-linus-v3.10-rc3' of git://oss.sgi.com/xfs/xfs

[firefly-linux-kernel-4.4.55.git] / drivers / staging / iio / adc / Kconfig

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 7b2a01d64f5ecfc517aafd56e13b78126f1d73dc..cabc7a367db50833f6e40dc55ebec4efb9cb57bb 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -73,7 +73,7 @@ config AD7780
 config AD7816
        tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
        depends on SPI
-       depends on GENERIC_GPIO
+       depends on GPIOLIB
        help
          Say yes here to build support for Analog Devices AD7816/7/8
          temperature sensors and ADC.
@@ -90,13 +90,6 @@ config AD7192
          To compile this driver as a module, choose M here: the
          module will be called ad7192.
 
-config ADT7410
-       tristate "Analog Devices ADT7310/ADT7410 temperature sensor driver"
-       depends on I2C || SPI_MASTER
-       help
-         Say yes here to build support for Analog Devices ADT7310/ADT7410
-         temperature sensors.
-
 config AD7280
        tristate "Analog Devices AD7280A Lithium Ion Battery Monitoring System"
        depends on SPI