aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ssb
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2018-02-01 10:37:39 +0200
committerKalle Valo <kvalo@codeaurora.org>2018-02-01 10:37:39 +0200
commitb954c8623dcce8aeee8d58e19c0004e926fbc3e0 (patch)
tree26daa645c72e0a472a80ea79ad22e69d6278848e /drivers/ssb
parentf813614f531114db796ad66ced75c5dc8db7aa3a (diff)
parenta9e6d44ddeccd3522670e641f1ed9b068e746ff7 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
The last pull request didn't make it to v4.15 (I was too late) so pull it to wireless-drivers-next.git instead so that it can go to v4.16.
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index ee18428a051f..b3f5cae98ea6 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -31,7 +31,7 @@ config SSB_BLOCKIO
config SSB_PCIHOST_POSSIBLE
bool
- depends on SSB && (PCI = y || PCI = SSB) && PCI_DRIVERS_LEGACY
+ depends on SSB && (PCI = y || PCI = SSB) && (PCI_DRIVERS_LEGACY || !MIPS)
default y
config SSB_PCIHOST

Privacy Policy