diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 23:21:28 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 23:21:28 +0300 |
commit | ed15e8880fc3d8d52bc02a02521054bfcb26264a (patch) | |
tree | 816a7f35028762976f5d4bc4df172e407c4bcbe2 /drivers/iio/light/Kconfig | |
parent | b8d1f261fe7e4967593a5637d62991b6197a03f8 (diff) | |
parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
download | linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.xz |
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/light/Kconfig')
-rw-r--r-- | drivers/iio/light/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index 730fa80c83ea..b37e18d07630 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -199,6 +199,7 @@ config SENSORS_LM3533 config LTR501 tristate "LTR-501ALS-01 light sensor" depends on I2C + select REGMAP_I2C select IIO_BUFFER select IIO_TRIGGERED_BUFFER help @@ -212,6 +213,7 @@ config LTR501 config STK3310 tristate "STK3310 ALS and proximity sensor" depends on I2C + select REGMAP_I2C help Say yes here to get support for the Sensortek STK3310 ambient light and proximity sensor. The STK3311 model is also supported by this |