Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 845fb737696baa194bcd7f760421ec6b879ed9ba..f1e6aa7b93bbb9ae8e9e57d8e6eed9f1d8f94193 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -39,6 +39,20 @@ config I2C_CHARDEV
          This support is also available as a module.  If so, the module 
          will be called i2c-dev.
 
+config I2C_HELPER_AUTO
+       bool "Autoselect pertinent helper modules"
+       default y
+       help
+         Some I2C bus drivers require so-called "I2C algorithm" modules
+         to work. These are basically software-only abstractions of generic
+         I2C interfaces. This option will autoselect them so that you don't
+         have to care.
+
+         Unselect this only if you need to enable additional helper
+         modules, for example for use with external I2C bus drivers.
+
+         In doubt, say Y.
+
 source drivers/i2c/algos/Kconfig
 source drivers/i2c/busses/Kconfig
 source drivers/i2c/chips/Kconfig