Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 631736e2e7ed94297a0f871615d6d5b6c9e6acd3..eb65940cdb563b687460355ac0cf8eb7a7f69ec0 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -724,6 +724,12 @@ config I2C_VERSATILE
          This driver can also be built as a module.  If so, the module
          will be called i2c-versatile.
 
+config I2C_XILINX_PS
+       tristate "XILINX PS I2C Controller"
+       depends on ARCH_ZYNQ
+       help
+         Say yes here to select Xilnx PS I2C Host Controller
+
 config I2C_OCTEON
        tristate "Cavium OCTEON I2C bus support"
        depends on CPU_CAVIUM_OCTEON