diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-11 13:58:36 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-11 13:58:36 -0500 |
| commit | 3d93e33780b059e7e95d78491692df40b18ceb5c (patch) | |
| tree | 749a9c9414a94f9990d1818e0ea287ac648f67ce /drivers/bluetooth/btbcm.h | |
| parent | 297a6961ffb8ff4dc66c9fbf53b924bd1dda05d5 (diff) | |
| parent | ff8759609d021c0e85945fcc4a148a0e55ace70f (diff) | |
| download | linux-3d93e33780b059e7e95d78491692df40b18ceb5c.tar.gz linux-3d93e33780b059e7e95d78491692df40b18ceb5c.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2018-01-11
Here's likely the last bluetooth-next pull request for the 4.16 kernel.
- Added support for Bluetooth on 2015+ MacBook (Pro)
- Fix to QCA Rome suspend/resume handling
- Two new QCA_ROME USB IDs in btusb
- A few other minor fixes
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/btbcm.h')
| -rw-r--r-- | drivers/bluetooth/btbcm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h index d9e6b41658e5..cfe6ad4cc621 100644 --- a/drivers/bluetooth/btbcm.h +++ b/drivers/bluetooth/btbcm.h @@ -44,8 +44,8 @@ struct bcm_set_sleep_mode { __u8 tristate_control; __u8 usb_auto_sleep; __u8 usb_resume_timeout; - __u8 pulsed_host_wake; __u8 break_to_host; + __u8 pulsed_host_wake; } __packed; struct bcm_set_pcm_int_params { |