diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-26 01:39:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-26 01:39:38 -0400 |
| commit | 89eb6e096782b749eadead3824b3a65255c7d0e3 (patch) | |
| tree | da71c7dce281baefed6e5ad7a5d74d6f300bfb62 /include/linux/mmc/sdio_ids.h | |
| parent | 8b4483658364f05b2e32845c8f445cdfd9452286 (diff) | |
| parent | d5bb334a8e171b262e48f378bd2096c0ea458265 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2019-04-25
Here's the main bluetooth-next pull request for the 5.2 kernel.
- Added support for Mediatek SDIO controllers
- Added support for Broadcom BCM2076B1 UART controller
- Added support for Marvel SD8987 chipset
- Fix buffer overflow bug in hidp protocol
- Various other smaller fixes & improvements
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mmc/sdio_ids.h')
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 4332199c71c2..d1a5d5df02f5 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -59,6 +59,8 @@ #define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128 #define SDIO_DEVICE_ID_MARVELL_8887WLAN 0x9134 +#define SDIO_VENDOR_ID_MEDIATEK 0x037a + #define SDIO_VENDOR_ID_SIANO 0x039a #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 #define SDIO_DEVICE_ID_SIANO_NICE 0x0202 |