Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / Kconfig

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 2ca170bc7e0d2c4ec82d8e40ac9fadf4093c9184..744ecbcc450cc6b690e22f19c35239fa90fd1f07 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -1,4 +1,4 @@
-#
+

 # Miscellaneous I2C chip drivers configuration
 #
 # *** DEPRECATED! Do not add new entries! See Makefile ***
 # Miscellaneous I2C chip drivers configuration
 #
 # *** DEPRECATED! Do not add new entries! See Makefile ***


@@ -114,19 +114,6 @@ config SENSORS_PCF8591
          These devices are hard to detect and rarely found on mainstream
          hardware.  If unsure, say N.
 
          These devices are hard to detect and rarely found on mainstream
          hardware.  If unsure, say N.
 

-config TPS65010
-       tristate "TPS6501x Power Management chips"
-       depends on GPIOLIB
-       default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
-       help
-         If you say yes here you get support for the TPS6501x series of
-         Power Management chips.  These include voltage regulators,
-         lithium ion/polymer battery charging, and other features that
-         are often used in portable devices like cell phones and cameras.
-
-         This driver can also be built as a module.  If so, the module
-         will be called tps65010.
-

 config TWL4030_MADC
        tristate "TWL4030 MADC Driver"
        depends on TWL4030_CORE
 config TWL4030_MADC
        tristate "TWL4030 MADC Driver"
        depends on TWL4030_CORE