diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-08-07 07:53:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-08-07 07:53:41 -0400 |
| commit | 6ac7ada210a8d23a56fbf18b6e1e00528844565c (patch) | |
| tree | f62352a9b08e560f41cd4008ec0029b6b026d3a5 /drivers/spi/Kconfig | |
| parent | 73851b36fe73819f8c201971e913324d4846a7ea (diff) | |
| parent | d00a9e02178401433fc386e69c936f2039f07b57 (diff) | |
Merge tag 'asoc-fix-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.2
There are a couple of small driver specific fixes here but the
overwhelming bulk of these changes are fixes to the topology ABI that
has been newly introduced in v4.2. Once this makes it into a release we
will have to firm this up but for now getting enhancements in before
they've made it into a release is the most expedient thing.
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 | |||
| 612 | 612 | ||
| 613 | config SPI_ZYNQMP_GQSPI | 613 | config SPI_ZYNQMP_GQSPI |
| 614 | tristate "Xilinx ZynqMP GQSPI controller" | 614 | tristate "Xilinx ZynqMP GQSPI controller" |
| 615 | depends on SPI_MASTER | 615 | depends on SPI_MASTER && HAS_DMA |
| 616 | help | 616 | help |
| 617 | Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC. | 617 | Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC. |
| 618 | 618 | ||