diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 22:35:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 22:35:49 +0200 |
| commit | 79d2d21ee06f3634423d1a45fb6ddfcae59061fd (patch) | |
| tree | 16ddd4a4f0ccd337d57a24fbc51fadb4c6e4248d /drivers/spi/Kconfig | |
| parent | Merge tag 'regulator-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/... (diff) | |
| download | linux-79d2d21ee06f3634423d1a45fb6ddfcae59061fd.tar.xz linux-79d2d21ee06f3634423d1a45fb6ddfcae59061fd.zip | |
Merge tag 'spi-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A few driver specific fixes, the main one being the fix for handling
of complete callbacks that are open coded in individual drivers to
allow callers to omit the completion. As we move things into the core
that sort of issue should become less and less common"
* tag 'spi-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: qup: Depend on ARCH_QCOM
spi: efm32: Update binding document to make "efm32,location" property optional
spi: omap2-mcspi: Convert to use devm_kcalloc
spi: Always check complete callback before calling it
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 efe1960af2b3..60f2b41c7310 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -383,7 +383,7 @@ config SPI_RSPI config SPI_QUP tristate "Qualcomm SPI controller with QUP interface" - depends on ARCH_MSM_DT || (ARM && COMPILE_TEST) + depends on ARCH_QCOM || (ARM && COMPILE_TEST) help Qualcomm Universal Peripheral (QUP) core is an AHB slave that provides a common data path (an output FIFO and an input FIFO) |