Merge commit 'origin/master' into next

[pandora-kernel.git] / drivers / i2c / chips / Kconfig

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 8f8c81e..02d746c 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -64,21 +64,6 @@ config SENSORS_PCA9539
          This driver is deprecated and will be dropped soon. Use
          drivers/gpio/pca953x.c instead.
 
-config SENSORS_MAX6875
-       tristate "Maxim MAX6875 Power supply supervisor"
-       depends on EXPERIMENTAL
-       help
-         If you say yes here you get support for the Maxim MAX6875
-         EEPROM-programmable, quad power-supply sequencer/supervisor.
-
-         This provides an interface to program the EEPROM and reset the chip.
-
-         This driver also supports the Maxim MAX6874 hex power-supply
-         sequencer/supervisor if found at a compatible address.
-
-         This driver can also be built as a module.  If so, the module
-         will be called max6875.
-
 config SENSORS_TSL2550
        tristate "Taos TSL2550 ambient light sensor"
        depends on EXPERIMENTAL