diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-07 17:34:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-07 17:34:04 -0800 |
| commit | 5ba907a949562cd4839b0170a13dda6841055e70 (patch) | |
| tree | 32d7ab834753779d3e1216a3a251c8c2fb097438 /drivers/iio/accel/Kconfig | |
| parent | abb4f8addf1d55f3a63ac84e3d9f609f97e5b9a0 (diff) | |
| parent | 388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 (diff) | |
| download | linux-5ba907a949562cd4839b0170a13dda6841055e70.tar.gz linux-5ba907a949562cd4839b0170a13dda6841055e70.tar.bz2 linux-5ba907a949562cd4839b0170a13dda6841055e70.zip | |
Merge 4.5-rc3 into staging-next
We want the upstream staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/accel/Kconfig')
| -rw-r--r-- | drivers/iio/accel/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index d9feaa3c1fb8..b0d3ecf3318b 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -213,6 +213,7 @@ config STK8312 config STK8BA50 tristate "Sensortek STK8BA50 3-Axis Accelerometer Driver" depends on I2C + depends on IIO_TRIGGER help Say yes here to get support for the Sensortek STK8BA50 3-axis accelerometer. |