diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-20 19:40:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-20 19:40:35 -0400 |
| commit | 56025caa821d8e398b7cff2c45fb1e3e769549d7 (patch) | |
| tree | 59d35e89cf27eb60aab334c7a53cfa3e99dacda0 /include | |
| parent | 05a56487174d33fff5986f13c0c8e4b32f046da9 (diff) | |
| parent | 52776a700b53969345a3cc5daed1c797d016a188 (diff) | |
| download | linux-stable-56025caa821d8e398b7cff2c45fb1e3e769549d7.tar.gz linux-stable-56025caa821d8e398b7cff2c45fb1e3e769549d7.tar.bz2 linux-stable-56025caa821d8e398b7cff2c45fb1e3e769549d7.zip | |
Merge tag 'wireless-drivers-next-for-davem-2016-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers patches for 4.7
Major changes:
iwlwifi
* remove IWLWIFI_DEBUG_EXPERIMENTAL_UCODE kconfig option
* work for RX multiqueue continues
* dynamic queue allocation work continues
* add Luca as maintainer
* a bunch of fixes and improvements all over
brcmfmac
* add 4356 sdio support
ath6kl
* add ability to set debug uart baud rate with a module parameter
wil6210
* add debugfs file to configure firmware led functionality
====================
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 83430f2ea757..0d126aeb3ec0 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -36,6 +36,7 @@ #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345 #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 +#define SDIO_DEVICE_ID_BROADCOM_4356 0x4356 #define SDIO_VENDOR_ID_INTEL 0x0089 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 |