summaryrefslogtreecommitdiffstats
path: root/drivers/iio/adc
diff options
context:
space:
mode:
authorHartmut Knaack <knaack.h@gmx.de>2015-06-21 12:15:50 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 09:29:01 -0700
commit62d59f98d13440855e140a68ba6996fd3ff89b50 (patch)
treec491d8c46d0101a08ddb2cc89f8b582aa6d6bcec /drivers/iio/adc
parent19d75d2ca962e8a7d3e2351f9062bd7093e0941f (diff)
downloadlinux-stable-62d59f98d13440855e140a68ba6996fd3ff89b50.tar.gz
linux-stable-62d59f98d13440855e140a68ba6996fd3ff89b50.tar.bz2
linux-stable-62d59f98d13440855e140a68ba6996fd3ff89b50.zip
iio:adc:cc10001_adc: fix Kconfig dependency
commit b2b3c3dc6a7bef886850920f5f5dca041b443aa0 upstream. The Cosmic Circuits 10001 ADC driver depends on HAS_IOMEM, HAVE_CLK and REGULATOR together, not just any of these. Signed-off-by: Hartmut Knaack <knaack.h@gmx.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r--drivers/iio/adc/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index e36a73e7c3a8..1bcb65b8d4a1 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -146,8 +146,7 @@ config DA9150_GPADC
config CC10001_ADC
tristate "Cosmic Circuits 10001 ADC driver"
- depends on HAVE_CLK || REGULATOR
- depends on HAS_IOMEM
+ depends on HAS_IOMEM && HAVE_CLK && REGULATOR
select IIO_BUFFER
select IIO_TRIGGERED_BUFFER
help