Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 573c449c49b9138a69f8aaf9a999e8a41898d2e1..2897bd1a4284e9b49225e3083f28c69ad1779c71 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -234,9 +234,15 @@ config GPIO_TS5500
 
 config GPIO_XILINX
        bool "Xilinx GPIO support"
-       depends on PPC_OF || MICROBLAZE
+       depends on PPC_OF || MICROBLAZE || ARCH_ZYNQ
        help
-         Say yes here to support the Xilinx FPGA GPIO device
+         Say yes here to support the Xilinx AXI/XPS GPIO device
+
+config GPIO_XILINX_PS
+       tristate "Xilinx GPIO PS"
+       depends on ARCH_ZYNQ
+       help
+         Say yes here to support Xilinx GPIO PS controller
 
 config GPIO_VR41XX
        tristate "NEC VR4100 series General-purpose I/O Uint support"