Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for...

diff --cc drivers/i2c/busses/Kconfig
index 9294dc21861a2bbc2fa8c689ecaa49d409539a78,b6e53c277276314828ba2d8434da19303182b869,5b592dfcbd78e1b8ed32f262d88fcf567001d434,e08e8356bdb58b248dc45a38ac3a6ec6c0a6ba08..2a44a2ff2c5c1bd4bcf79d49c066bef1c7411589
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
--- 3/drivers/i2c/busses/Kconfig
--- 4/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 8596cfdb43efc562a529fc3fa3d00622ad0fe24c,1dd554e5144011fb8f40fef4227b1f5251984cea,9d2d0ec7fb2323ee757f119720aae7b824645780,77cf7e6447fc4c7a3096b836f80acf9d77e741f7..e6cf294d37293b75287c566353f0945a7d5203ee
--- 1/drivers/i2c/busses/Makefile
--- 2/drivers/i2c/busses/Makefile
--- 3/drivers/i2c/busses/Makefile
--- 4/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

diff --cc drivers/i2c/busses/i2c-eg20t.c
Simple merge