diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-02 00:46:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-02 00:46:01 +0300 |
| commit | 859a59352e926315b6384c5fd895b00a30659a12 (patch) | |
| tree | 8fd65cdfe3152fb34f6558b8ef4f14275ded76e1 /drivers/bluetooth/bpa10x.c | |
| parent | 5366271c72689059203007143487c69dd498206c (diff) | |
| parent | 9ea471320e1302be0fac67c14a7ab7982609fea7 (diff) | |
| download | linux-859a59352e926315b6384c5fd895b00a30659a12.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-04-01
Here's (most likely) the last bluetooth-next pull request for the 4.17
kernel:
- Remove unused btuart_cs driver (replaced by serial_cs + hci_uart)
- New USB ID for Edimax EW-7611ULB controller
- Cleanups & fixes to hci_bcm driver
- Clenups to btmrvl driver
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/bpa10x.c')
| -rw-r--r-- | drivers/bluetooth/bpa10x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c index 801ea4ca65e4..c6f7cc57db14 100644 --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c @@ -35,7 +35,7 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#include "hci_uart.h" +#include "h4_recv.h" #define VERSION "0.11" |