diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-05-17 16:00:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-17 16:00:40 -0400 |
| commit | a564b659bb4dc98b810a44d496a5dae1c3011cf5 (patch) | |
| tree | 21bdc3f29e60521d8096b9adc7e0a91268f6a795 /include | |
| parent | vmxnet3: Replace msleep(1) with usleep_range() (diff) | |
| parent | brcmfmac: fix initialization of struct cfg80211_inform_bss variable (diff) | |
| download | linux-dev-a564b659bb4dc98b810a44d496a5dae1c3011cf5.tar.xz linux-dev-a564b659bb4dc98b810a44d496a5dae1c3011cf5.zip | |
Merge tag 'wireless-drivers-next-for-davem-2018-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.18
The first pull request for 4.18. As usual new features and bug fixes
but nothing really special.
I also merged wireless-drivers due to an iwlwifi patch dependency.
Major changes:
iwlwifi
* implement Traffic Condition Monitor and use it for scan, BT coex and
to detect when the AP doesn't support UAPSD properly
* some more work for the 22000 family of devices;
* introduce AMSDU rate control offload
qtnfmac
* DFS offload support
rsi
* roaming enhancements
* increase max supported aggregation subframes
* don't advertise 5 GHz support if the device doesn't support it
brcmfmac
* add support for BCM4366E chipset
* add support for bcm43364 wireless chipset
ath10k
* enable temperature reads for QCA6174 and QCA9377
* add firmware memory dump support for QCA9984
* continue adding WCN3990 support via SNOC bus
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index cdd66a5fbd5e..0a7abe8a407f 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -35,6 +35,7 @@ #define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335 #define SDIO_DEVICE_ID_BROADCOM_4339 0x4339 #define SDIO_DEVICE_ID_BROADCOM_43362 0xa962 +#define SDIO_DEVICE_ID_BROADCOM_43364 0xa9a4 #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345 #define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf |