From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 21 Mar 2011 22:57:25 +0000 (+0000)
Subject: Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for... 
X-Git-Tag: v2.6.39-rc1~387^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a0774f4511371319418f959ce838f81d47a3fd56;p=~shefty%2Frdma-dev.git

Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-2
---

a0774f4511371319418f959ce838f81d47a3fd56
diff --cc drivers/i2c/busses/Kconfig
index 9294dc21861,b6e53c27727,5b592dfcbd7,e08e8356bdb..2a44a2ff2c5
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@@@ -533,20 -533,20 -523,9 -533,9 +533,20 @@@@@ config I2C_PN
    	  This driver can also be built as a module.  If so, the module
    	  will be called i2c-pnx.
    
  ++config I2C_PUV3
  ++	tristate "PKUnity v3 I2C bus support"
  ++	depends on UNICORE32 && ARCH_PUV3
  ++	select I2C_ALGOBIT
  ++	help
  ++	  This driver supports the I2C IP inside the PKUnity-v3 SoC.
  ++	  This I2C bus controller is under AMBA/AXI bus.
  ++
  ++	  This driver can also be built as a module.  If so, the module
  ++	  will be called i2c-puv3.
  ++
    config I2C_PXA
    	tristate "Intel PXA2XX I2C adapter"
- --	depends on ARCH_PXA || ARCH_MMP
+ ++	depends on ARCH_PXA || ARCH_MMP || (X86_32 && PCI && OF)
    	help
    	  If you have devices in the PXA I2C bus, say yes to this option.
    	  This driver can also be built as a module.  If so, the module
diff --cc drivers/i2c/busses/Makefile
index 8596cfdb43e,1dd554e5144,9d2d0ec7fb2,77cf7e6447f..e6cf294d372
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@@@@ -52,8 -52,9 -51,7 -52,7 +52,9 @@@@@ obj-$(CONFIG_I2C_PASEMI)	+= i2c-pasemi.
    obj-$(CONFIG_I2C_PCA_PLATFORM)	+= i2c-pca-platform.o
    obj-$(CONFIG_I2C_PMCMSP)	+= i2c-pmcmsp.o
    obj-$(CONFIG_I2C_PNX)		+= i2c-pnx.o
  ++obj-$(CONFIG_I2C_PUV3)		+= i2c-puv3.o
    obj-$(CONFIG_I2C_PXA)		+= i2c-pxa.o
+ ++obj-$(CONFIG_I2C_PXA_PCI)	+= i2c-pxa-pci.o
    obj-$(CONFIG_I2C_S3C2410)	+= i2c-s3c2410.o
    obj-$(CONFIG_I2C_S6000)		+= i2c-s6000.o
    obj-$(CONFIG_I2C_SH7760)	+= i2c-sh7760.o