Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index d002528289667732e9032f68aa0dba6624abfd9c..64971baf11faebaff879c58067d23fd9bf29895a 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -429,34 +429,6 @@ config ARM_CHARLCD
          line and the Linux version on the second line, but that's
          still useful.
 
-config BMP085
-       tristate
-       depends on SYSFS
-
-config BMP085_I2C
-       tristate "BMP085 digital pressure sensor on I2C"
-       select BMP085
-       select REGMAP_I2C
-       depends on I2C && SYSFS
-       help
-         Say Y here if you want to support Bosch Sensortec's digital pressure
-         sensor hooked to an I2C bus.
-
-         To compile this driver as a module, choose M here: the
-         module will be called bmp085-i2c.
-
-config BMP085_SPI
-       tristate "BMP085 digital pressure sensor on SPI"
-       select BMP085
-       select REGMAP_SPI
-       depends on SPI_MASTER && SYSFS
-       help
-         Say Y here if you want to support Bosch Sensortec's digital pressure
-         sensor hooked to an SPI bus.
-
-         To compile this driver as a module, choose M here: the
-         module will be called bmp085-spi.
-
 config PCH_PHUB
        tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"
        select GENERIC_NET_UTILS