Merge tag 'staging-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / drivers / iio / pressure / Kconfig

diff --git a/drivers/iio/pressure/Kconfig b/drivers/iio/pressure/Kconfig
index d130cdc..15cd416 100644 (file)
--- a/drivers/iio/pressure/Kconfig
+++ b/drivers/iio/pressure/Kconfig
@@ -8,8 +8,6 @@ menu "Pressure sensors"
 config BMP280
        tristate "Bosch Sensortec BMP180/BMP280 pressure sensor I2C driver"
        depends on (I2C || SPI_MASTER)
-       depends on !(BMP085_I2C=y || BMP085_I2C=m)
-       depends on !(BMP085_SPI=y || BMP085_SPI=m)
        select REGMAP
        select BMP280_I2C if (I2C)
        select BMP280_SPI if (SPI_MASTER)
@@ -187,4 +185,26 @@ config HP206C
          This driver can also be built as a module. If so, the module will
          be called hp206c.
 
+config ZPA2326
+       tristate "Murata ZPA2326 pressure sensor driver"
+       select IIO_BUFFER
+       select IIO_TRIGGERED_BUFFER
+       select REGMAP
+       select ZPA2326_I2C if I2C
+       select ZPA2326_SPI if SPI_MASTER
+       help
+         Say Y here to build support for the Murata ZPA2326 pressure and
+         temperature sensor.
+
+         To compile this driver as a module, choose M here: the module will
+         be called zpa2326.
+
+config ZPA2326_I2C
+       tristate
+       select REGMAP_I2C
+
+config ZPA2326_SPI
+       tristate
+       select REGMAP_SPI
+
 endmenu