diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-24 05:13:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-24 05:13:16 -0700 |
| commit | a72c9512bf2bef12c5e66a4d910c4b348fe31d61 (patch) | |
| tree | cfce1711f9a5fc1ef0774e9f2e31945600ff15e0 /drivers/bluetooth/hci_uart.h | |
| parent | 379a80a1d048dcacfc2011d5d32e16d5c804b9f4 (diff) | |
| parent | 13972adc3240ea8b18b44906b819c622941a64b6 (diff) | |
| download | linux-next-a72c9512bf2bef12c5e66a4d910c4b348fe31d61.tar.gz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-10-22
Here's probably the last bluetooth-next pull request for 4.4. Among
several other changes it contains the rest of the fixes & cleanups from
the Bluetooth UnplugFest (that didn't need to be hurried to 4.3).
- Refactoring & cleanups to 6lowpan code
- New USB ids for two Atheros controllers and BCM43142A0 from Broadcom
- Fix (quirk) for broken Broadcom BCM2045 controllers
- Support for latest Apple controllers
- Improvements to the vendor diagnostic message support
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/hci_uart.h')
| -rw-r--r-- | drivers/bluetooth/hci_uart.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h index 2f7bb35a890e..82c92f1b65b4 100644 --- a/drivers/bluetooth/hci_uart.h +++ b/drivers/bluetooth/hci_uart.h @@ -59,6 +59,7 @@ struct hci_uart; struct hci_uart_proto { unsigned int id; const char *name; + unsigned int manufacturer; unsigned int init_speed; unsigned int oper_speed; int (*open)(struct hci_uart *hu); |