summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2016-02-01 22:08:26 +0100
committerGreg Kroah-Hartman2016-02-01 22:08:26 +0100
commit5982557ac6ee5d36a02248be18a2ba945360d9f6 (patch)
tree51b3441bd9cfc31c5515b2ddd07e4183392fbe8d /drivers/staging/iio
parentMerge tag 'iio-fixes-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentiio: dht11: Use boottime (diff)
downloadkernel-qcow2-linux-5982557ac6ee5d36a02248be18a2ba945360d9f6.tar.gz
kernel-qcow2-linux-5982557ac6ee5d36a02248be18a2ba945360d9f6.tar.xz
kernel-qcow2-linux-5982557ac6ee5d36a02248be18a2ba945360d9f6.zip
Merge tag 'iio-fixes-for-4.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes: Second set of IIO fixes for the 4.5 cycle. These ones are mostly dependent on patches from the recent merge cycle. * adc, imu and iio staging drivers - !HAS_IOMEM dependency fixes * dht11 - use boottime clock for time measurement to avoid incorrect measurements due to clock updates. * lidar - correct a return value for short i2c transfers.
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r--drivers/staging/iio/adc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 58d4517e1836..b9519be90fda 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -6,6 +6,7 @@ menu "Analog to digital converters"
config AD7606
tristate "Analog Devices AD7606 ADC driver"
depends on GPIOLIB || COMPILE_TEST
+ depends on HAS_IOMEM
select IIO_BUFFER
select IIO_TRIGGERED_BUFFER
help