diff options
author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-07-06 19:34:13 +0300 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-07-06 19:34:13 +0300 |
commit | e22e953189f7b3a3bfc7efb511d2b1d1454adde5 (patch) | |
tree | 87e56e966e1f676f2c9389c41aa5c37969f757f1 /drivers/net/wireless/quantenna/qtnfmac/Kconfig | |
parent | a012024571d98e2e4bf29a9168fb7ddc44b7ab86 (diff) | |
parent | 4da1d4c751c9b1b713c13043bad7c4d27cd1418c (diff) | |
download | linux-e22e953189f7b3a3bfc7efb511d2b1d1454adde5.tar.xz |
Merge drm-upstream/drm-next into drm-misc-next
Pull in the malidp writeback implementation for further work on writeback in drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'drivers/net/wireless/quantenna/qtnfmac/Kconfig')
-rw-r--r-- | drivers/net/wireless/quantenna/qtnfmac/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/quantenna/qtnfmac/Kconfig b/drivers/net/wireless/quantenna/qtnfmac/Kconfig index 025fa6018550..8d1492a90bd1 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/Kconfig +++ b/drivers/net/wireless/quantenna/qtnfmac/Kconfig @@ -7,7 +7,7 @@ config QTNFMAC config QTNFMAC_PEARL_PCIE tristate "Quantenna QSR10g PCIe support" default n - depends on HAS_DMA && PCI && CFG80211 + depends on PCI && CFG80211 select QTNFMAC select FW_LOADER select CRC32 |