From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 02:06:15 +0000 (+1000)
Subject: Merge remote-tracking branch 'i2c/i2c/for-next'
X-Git-Tag: next-20130619~84
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb7fb8c03359931e68921fffd6d76db178fd8aea;p=karo-tx-linux.git

Merge remote-tracking branch 'i2c/i2c/for-next'
---

bb7fb8c03359931e68921fffd6d76db178fd8aea
diff --cc drivers/i2c/busses/Kconfig
index 88f5f5f55bc5,96c6d82da3ed..7b591ee4dbd9
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -725,9 -715,19 +716,19 @@@ config I2C_VERSATIL
  	  This driver can also be built as a module.  If so, the module
  	  will be called i2c-versatile.
  
+ config I2C_WMT
+ 	tristate "Wondermedia WM8xxx SoC I2C bus support"
+ 	depends on ARCH_VT8500
+ 	help
+ 	  Say yes if you want to support the I2C bus on Wondermedia 8xxx-series
+ 	  SoCs.
+ 
+ 	  This driver can also be built as a module. If so, the module will be
+ 	  called i2c-wmt.
+ 
  config I2C_OCTEON
  	tristate "Cavium OCTEON I2C bus support"
 -	depends on CPU_CAVIUM_OCTEON
 +	depends on CAVIUM_OCTEON_SOC
  	help
  	  Say yes if you want to support the I2C serial bus on Cavium
  	  OCTEON SOC.