Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index fcde9bab5b96e07d510b39221874a015228be34b..9f3a4cd0b07f7468db3f086022e108bd86516805 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -92,9 +92,9 @@ config I2C_AU1550
 
 config I2C_BLACKFIN_TWI
        tristate "Blackfin TWI I2C support"
-       depends on BF534 || BF536 || BF537
+       depends on BF534 || BF536 || BF537 || BF54x
        help
-         This is the TWI I2C device driver for Blackfin 534/536/537.
+         This is the TWI I2C device driver for Blackfin 534/536/537/54x.
          This driver can also be built as a module.  If so, the module
          will be called i2c-bfin-twi.
 
@@ -208,6 +208,7 @@ config I2C_PIIX4
            ATI IXP400
            ATI SB600
            ATI SB700
+           ATI SB800
            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6
@@ -237,9 +238,6 @@ config I2C_IOP3XX
          This driver can also be built as a module.  If so, the module
          will be called i2c-iop3xx.
 
-config I2C_ISA
-       tristate
-
 config I2C_IXP4XX
        tristate "IXP4xx GPIO-Based I2C Interface (DEPRECATED)"
        depends on ARCH_IXP4XX
@@ -560,7 +558,7 @@ config I2C_VERSATILE
          will be called i2c-versatile.
 
 config I2C_ACORN
-       bool "Acorn IOC/IOMD I2C bus support"
+       tristate "Acorn IOC/IOMD I2C bus support"
        depends on ARCH_ACORN
        default y
        select I2C_ALGOBIT