diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:10:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:10:05 +0200 |
| commit | 6e64e22449023dc89dfb92c6f19d4c5b03f46889 (patch) | |
| tree | c0099a75238a2cdcedf005956963329eee0aac75 /drivers/iio/magnetometer/Kconfig | |
| parent | staging: lustre: Replace strtoul with simple_strtoul (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | linux-6e64e22449023dc89dfb92c6f19d4c5b03f46889.tar.xz linux-6e64e22449023dc89dfb92c6f19d4c5b03f46889.zip | |
Merge 4.2-rc4 into staging-next
We want the iio and other fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/magnetometer/Kconfig')
| -rw-r--r-- | drivers/iio/magnetometer/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig index dcadfc4f0661..efb9350b0d76 100644 --- a/drivers/iio/magnetometer/Kconfig +++ b/drivers/iio/magnetometer/Kconfig @@ -90,6 +90,7 @@ config IIO_ST_MAGN_SPI_3AXIS config BMC150_MAGN tristate "Bosch BMC150 Magnetometer Driver" depends on I2C + select REGMAP_I2C select IIO_BUFFER select IIO_TRIGGERED_BUFFER help |