Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 7 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 916ba5e40a96..6e9da1372225 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -182,14 +182,8 @@ config I2C_IOP3XX
           will be called i2c-iop3xx.
 
 config I2C_ISA
-        tristate "ISA Bus support"
+        tristate
         depends on I2C
-        help
-          If you say yes to this option, support will be included for i2c
-          interfaces that are on the ISA bus.
-
-          This driver can also be built as a module.  If so, the module
-          will be called i2c-isa.
 
 config I2C_ITE
         tristate "ITE I2C Adapter"