Merge branch 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux

* 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux:
  i2c-intel-mid: Driver depends on PCI
  i2c-intel-mid: support for Moorestown and Medfield platform
  i2c-nomadik: fixup bus delays
  i2c-nomadik: support smbus emulation
  i2c-nomadik: dynamic clocking
  i2c-nomadik: documentation fixes
  i2c-s3c2410: Enable i2c clock only when doing some transfert

diff --combined drivers/i2c/busses/Kconfig
index fd455a2,175ba23..c950be3
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -95,9 -95,9 +95,9 @@@ config I2C_I80
            ESB2
            ICH8
            ICH9
 -          Tolapai
 +          EP80579 (Tolapai)
            ICH10
 -          3400/5 Series (PCH)
 +          5/3400 Series (PCH)
            Cougar Point (PCH)
  
          This driver can also be built as a module.  If so, the module
@@@ -396,6 -396,16 +396,16 @@@ config I2C_IM
          This driver can also be built as a module.  If so, the module
          will be called i2c-imx.
  
+ config I2C_INTEL_MID
+       tristate "Intel Moorestown/Medfield Platform I2C controller"
+       depends on PCI
+       help
+         Say Y here if you have an Intel Moorestown/Medfield platform I2C
+         controller.
+ 
+         This support is also available as a module. If so, the module
+         will be called i2c-intel-mid.
+ 
  config I2C_IOP3XX
        tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
        depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX