diff options
author | David S. Miller <davem@davemloft.net> | 2015-10-30 20:38:24 +0900 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-30 20:38:24 +0900 |
commit | a493bcf8d6caf28f062c5f8f2ba486fdbf1ae899 (patch) | |
tree | 66d31fa2f1296caee8f46ea019d032c1bac3b111 /arch | |
parent | e258d919b175e0160a694a20fb309e29fc93d7b1 (diff) | |
parent | 8aaa878de83a0de3833f5b00bc822dbcd403ec36 (diff) | |
download | lwn-a493bcf8d6caf28f062c5f8f2ba486fdbf1ae899.tar.gz lwn-a493bcf8d6caf28f062c5f8f2ba486fdbf1ae899.zip |
Merge tag 'wireless-drivers-next-for-davem-2015-10-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
iwlwifi
* bug fix for TDLS
* fixes and cleanups in scan
* support of several scan plans
* improvements in FTM
* fixes in FW API
* improvements in the failure paths when the bus is dead
* other various small things here and there
ath10k
* add QCA9377 support
* fw_stats support for 10.4 firmware
ath6kl
* report antenna configuration to user space
* implement ethtool stats
ssb
* add Kconfig SSB_HOST_SOC for compiling SoC related code
* move functions specific to SoC hosted bus to separated file
* pick PCMCIA host code support from b43 driver
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/bcm47xx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig index 51ed599cc894..e970fd9cf769 100644 --- a/arch/mips/bcm47xx/Kconfig +++ b/arch/mips/bcm47xx/Kconfig @@ -4,6 +4,7 @@ config BCM47XX_SSB bool "SSB Support for Broadcom BCM47XX" select SYS_HAS_CPU_BMIPS32_3300 select SSB + select SSB_HOST_SOC select SSB_DRIVER_MIPS select SSB_DRIVER_EXTIF select SSB_EMBEDDED |