diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
| commit | acd632eb64b6cd8e25583bb248c36aa937b8f021 (patch) | |
| tree | 993d276cbadb450fe8cf5e3c66d444a905d452e7 /drivers/spi/Kconfig | |
| parent | 4b0c53e9e1a2a785746b2d379a32cb70b4dbb2fd (diff) | |
| parent | 5542b2aa9eea3f2bb922029c8cc4b4346c4f6b1c (diff) | |
| download | talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.tar.gz talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.zip | |
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 0cae1694014d..b0f30fb68914 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -612,7 +612,7 @@ config SPI_XTENSA_XTFPGA config SPI_ZYNQMP_GQSPI tristate "Xilinx ZynqMP GQSPI controller" - depends on SPI_MASTER + depends on SPI_MASTER && HAS_DMA help Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC. |
