summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bakker <xc-racer2@live.ca>2020-05-14 13:48:56 -0700
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2020-05-16 15:59:44 +0100
commita5e633eb79c4c9c03d5326149451829eeaaa06b4 (patch)
treed4a736df0c97bf5f8b2502221b2e14b51101503c
parentf9992af62fbf3a50d89d1f3914b2ff5cda187466 (diff)
downloadlinux-a5e633eb79c4c9c03d5326149451829eeaaa06b4.tar.gz
linux-a5e633eb79c4c9c03d5326149451829eeaaa06b4.tar.bz2
linux-a5e633eb79c4c9c03d5326149451829eeaaa06b4.zip
iio: accel: Make bma180 conflict with input's bma150
The bma180 IIO driver is being extended for support for the chips support by input's bma150 driver (bma023, bma150, smb380). Don't allow both drivers to be enabled simultaneously as they're for the same hardware. Signed-off-by: Jonathan Bakker <xc-racer2@live.ca> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-rw-r--r--drivers/iio/accel/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 24ebe9e76915..67c35b6eb910 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -90,7 +90,7 @@ config ADXL372_I2C
config BMA180
tristate "Bosch BMA180/BMA25x 3-Axis Accelerometer Driver"
- depends on I2C
+ depends on I2C && INPUT_BMA150=n
select IIO_BUFFER
select IIO_TRIGGERED_BUFFER
help