git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'spi/topic/master' into spi-next
[sfrench/cifs-2.6.git]
/
drivers
/
spi
/
Kconfig
diff --git
a/drivers/spi/Kconfig
b/drivers/spi/Kconfig
index e6d9e329a3801d6d59025610104866d811477b0e..82cd818aa06293f5903b92cf222471e7a8cad939 100644
(file)
--- a/
drivers/spi/Kconfig
+++ b/
drivers/spi/Kconfig
@@
-457,6
+457,7
@@
config SPI_OMAP24XX
config SPI_TI_QSPI
tristate "DRA7xxx QSPI controller support"
+ depends on HAS_DMA
depends on ARCH_OMAP2PLUS || COMPILE_TEST
help
QSPI master controller for DRA7xxx used for flash devices.