summaryrefslogtreecommitdiffstats
path: root/drivers/iio/light
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-05 08:13:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-05 08:13:24 +0200
commit9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e (patch)
tree052b3c229e00462cd0c5773c8b6b9fe314e86f38 /drivers/iio/light
parentstaging: octeon: Use IS_ENABLED() instead of checking for built-in or module (diff)
parentLinux 4.8-rc5 (diff)
downloadlinux-9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e.tar.xz
linux-9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e.zip
Merge 4.8-rc5 into staging-next
We want the staging fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/light')
-rw-r--r--drivers/iio/light/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 28217478d828..0db0a0d1bba0 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -76,7 +76,6 @@ config BH1750
config BH1780
tristate "ROHM BH1780 ambient light sensor"
depends on I2C
- depends on !SENSORS_BH1780
help
Say Y here to build support for the ROHM BH1780GLI ambient
light sensor.
@@ -238,6 +237,8 @@ config MAX44000
tristate "MAX44000 Ambient and Infrared Proximity Sensor"
depends on I2C
select REGMAP_I2C
+ select IIO_BUFFER
+ select IIO_TRIGGERED_BUFFER
help
Say Y here if you want to build support for Maxim Integrated's
MAX44000 ambient and infrared proximity sensor device.