summaryrefslogtreecommitdiffstats
path: root/drivers/iio/adc/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-20 22:21:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-20 22:21:28 +0200
commited15e8880fc3d8d52bc02a02521054bfcb26264a (patch)
tree816a7f35028762976f5d4bc4df172e407c4bcbe2 /drivers/iio/adc/Kconfig
parentstaging: dgap: remove duplicate code (diff)
parentLinux 4.2-rc3 (diff)
downloadlinux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.xz
linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.zip
Merge 4.2-rc3 into staging-next
We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/adc/Kconfig')
-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 dace593b158b..233d47b7dea8 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -163,8 +163,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