Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c-core: Some style cleanups
  i2c-piix4: Add support for the Broadcom HT1100 chipset
  i2c-piix4: Add support to SB800 SMBus changes
  i2c-pca-platform: Use defaults if no platform_data given
  i2c-algo-pca: Use timeout for checking the state machine
  i2c-algo-pca: Rework waiting for a free bus
  i2c-algo-pca: Add PCA9665 support
  i2c: Adapt debug macros for KERN_* constants
  i2c-davinci: Fix timeout handling
  i2c: Adapter timeout is in jiffies
  i2c: Set a default timeout value for all adapters
  i2c: Add missing KERN_* constants to printks
  i2c-algo-pcf: Handle timeout correctly
  i2c-algo-pcf: Style cleanups
  eeprom/at24: Remove EXPERIMENTAL
  i2c-nforce2: Add support for MCP67, MCP73, MCP78S and MCP79
  i2c: Clarify which clients are auto-removed
  i2c: Let checkpatch shout on users of the legacy model
  i2c: Document the different ways to instantiate i2c devices

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 7f95905bbb9d..da809ad0996a 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -132,6 +132,7 @@ config I2C_PIIX4
             Serverworks CSB5
             Serverworks CSB6
             Serverworks HT-1000
+            Serverworks HT-1100
             SMSC Victory66
 
           This driver can also be built as a module.  If so, the module
@@ -617,12 +618,12 @@ config I2C_ELEKTOR
           will be called i2c-elektor.
 
 config I2C_PCA_ISA
-        tristate "PCA9564 on an ISA bus"
+        tristate "PCA9564/PCA9665 on an ISA bus"
         depends on ISA
         select I2C_ALGOPCA
         default n
         help
-          This driver supports ISA boards using the Philips PCA9564
+          This driver supports ISA boards using the Philips PCA9564/PCA9665
           parallel bus to I2C bus controller.
 
           This driver can also be built as a module.  If so, the module
@@ -634,11 +635,11 @@ config I2C_PCA_ISA
           time).  If unsure, say N.
 
 config I2C_PCA_PLATFORM
-        tristate "PCA9564 as platform device"
+        tristate "PCA9564/PCA9665 as platform device"
         select I2C_ALGOPCA
         default n
         help
-          This driver supports a memory mapped Philips PCA9564
+          This driver supports a memory mapped Philips PCA9564/PCA9665
           parallel bus to I2C bus controller.
 
           This driver can also be built as a module.  If so, the module