diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-24 11:10:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-24 11:10:45 +0100 |
| commit | 334c40b17f0cc3de114197fa2cd75f89e3387d22 (patch) | |
| tree | cac7df874865fe571ba0f5ece6173fe97e6a6201 /drivers/spi/Kconfig | |
| parent | 39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff) | |
| parent | f8bb820da4ae863c676156627973a950129559fb (diff) | |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index ab8dfbef6f1b..198f96b7fb45 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -159,10 +159,9 @@ config SPI_BUTTERFLY config SPI_CADENCE tristate "Cadence SPI controller" - depends on ARM help This selects the Cadence SPI controller master driver - used by Xilinx Zynq. + used by Xilinx Zynq and ZynqMP. config SPI_CLPS711X tristate "CLPS711X host SPI controller" @@ -632,7 +631,7 @@ config SPI_DW_PCI config SPI_DW_MID_DMA bool "DMA support for DW SPI controller on Intel MID platform" - depends on SPI_DW_PCI && INTEL_MID_DMAC + depends on SPI_DW_PCI && DW_DMAC_PCI config SPI_DW_MMIO tristate "Memory-mapped io interface driver for DW SPI core" |