Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

Pull more i2c updates from Wolfram Sang:
 "Included are two bugfixes needing some bigger refactoring (sh_mobile:
  deferred probe with DMA, mv64xxx: fix offload support) and one
  deprecated driver removal I thought would go in via ppc but I
  misunderstood.  It has a proper ack from BenH"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: sh_mobile: fix uninitialized var when debug is enabled
  macintosh: therm_pm72: delete deprecated driver
  i2c: sh_mobile: I2C_SH_MOBILE should depend on HAS_DMA
  i2c: sh_mobile: rework deferred probing
  i2c: sh_mobile: refactor DMA setup
  i2c: mv64xxx: rework offload support to fix several problems
  i2c: mv64xxx: use BIT() macro for register value definitions

diff --combined drivers/i2c/busses/Kconfig
index 91a488c7cc443bfd4adc524ef228a3168ffb0881,f08dd20f625c184d923b71847425674a36c89de6..31e8308ba8990bffbaa6217aafa2bc0e72b62939
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -753,6 -753,7 +753,7 @@@ config I2C_SH776
  
  config I2C_SH_MOBILE
        tristate "SuperH Mobile I2C Controller"
+       depends on HAS_DMA
        depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
        help
          If you say yes to this option, support will be included for the
@@@ -1072,15 -1073,4 +1073,15 @@@ config SCx200_AC
          This support is also available as a module.  If so, the module
          will be called scx200_acb.
  
 +config I2C_OPAL
 +      tristate "IBM OPAL I2C driver"
 +      depends on PPC_POWERNV
 +      default y
 +      help
 +        This exposes the PowerNV platform i2c busses to the linux i2c layer,
 +        the driver is based on the OPAL interfaces.
 +
 +        This driver can also be built as a module. If so, the module will be
 +        called as i2c-opal.
 +
  endmenu