Merge tag 'iio-for-4.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[karo-tx-linux.git] / drivers / iio / pressure / Kconfig

diff --git a/drivers/iio/pressure/Kconfig b/drivers/iio/pressure/Kconfig
index 6f2e7c9ac23e33c557ecfd0517dca15dce91807e..cf03a43545a10b145a898bb7b04757dc3d695027 100644 (file)
--- a/drivers/iio/pressure/Kconfig
+++ b/drivers/iio/pressure/Kconfig
@@ -10,11 +10,11 @@ config BMP280
        depends on I2C
        select REGMAP_I2C
        help
-        Say yes here to build support for Bosch Sensortec BMP280
-        pressure and temperature sensor.
+         Say yes here to build support for Bosch Sensortec BMP280
+         pressure and temperature sensor.
 
-        To compile this driver as a module, choose M here: the module
-        will be called bmp280.
+         To compile this driver as a module, choose M here: the module
+         will be called bmp280.
 
 config HID_SENSOR_PRESS
        depends on HID_SENSOR_HUB
@@ -27,18 +27,33 @@ config HID_SENSOR_PRESS
          Say yes here to build support for the HID SENSOR
          Pressure driver
 
-          To compile this driver as a module, choose M here: the module
-          will be called hid-sensor-press.
+         To compile this driver as a module, choose M here: the module
+         will be called hid-sensor-press.
 
 config MPL115
+       tristate
+
+config MPL115_I2C
        tristate "Freescale MPL115A2 pressure sensor driver"
        depends on I2C
+       select MPL115
        help
          Say yes here to build support for the Freescale MPL115A2
          pressure sensor connected via I2C.
 
-          To compile this driver as a module, choose M here: the module
-          will be called mpl115.
+         To compile this driver as a module, choose M here: the module
+         will be called mpl115_i2c.
+
+config MPL115_SPI
+       tristate "Freescale MPL115A1 pressure sensor driver"
+       depends on SPI_MASTER
+       select MPL115
+       help
+         Say yes here to build support for the Freescale MPL115A1
+         pressure sensor connected via SPI.
+
+         To compile this driver as a module, choose M here: the module
+         will be called mpl115_spi.
 
 config MPL3115
        tristate "Freescale MPL3115A2 pressure sensor driver"
@@ -49,8 +64,8 @@ config MPL3115
          Say yes here to build support for the Freescale MPL3115A2
          pressure sensor / altimeter.
 
-          To compile this driver as a module, choose M here: the module
-          will be called mpl3115.
+         To compile this driver as a module, choose M here: the module
+         will be called mpl3115.
 
 config MS5611
        tristate "Measurement Specialties MS5611 pressure sensor driver"
@@ -82,7 +97,7 @@ config MS5611_SPI
 config MS5637
        tristate "Measurement Specialties MS5637 pressure & temperature sensor"
        depends on I2C
-        select IIO_MS_SENSORS_I2C
+       select IIO_MS_SENSORS_I2C
        help
          If you say yes here you get support for the Measurement Specialties
          MS5637 pressure and temperature sensor.
@@ -128,7 +143,7 @@ config T5403
          Say yes here to build support for the EPCOS T5403 pressure sensor
          connected via I2C.
 
-          To compile this driver as a module, choose M here: the module
-          will be called t5403.
+         To compile this driver as a module, choose M here: the module
+         will be called t5403.
 
 endmenu