From a5e633eb79c4c9c03d5326149451829eeaaa06b4 Mon Sep 17 00:00:00 2001 From: Jonathan Bakker Date: Thu, 14 May 2020 13:48:56 -0700 Subject: 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 Reviewed-by: Linus Walleij Signed-off-by: Jonathan Cameron --- drivers/iio/accel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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 -- cgit v1.2.3