diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-23 03:17:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-23 03:17:47 -0700 |
| commit | bfdc8dbdf840f2a96d7b4cbb73fc22d973c84441 (patch) | |
| tree | 5dc9cb0cdcf8a1212f2efbebed3ab6781eab39db /net/bluetooth/Makefile | |
| parent | 4cd6b4754492c08f00e6237fd7e5c8b443370d15 (diff) | |
| parent | 952497b159468477392f9b562b904da9bc76d468 (diff) | |
| download | cachepc-linux-bfdc8dbdf840f2a96d7b4cbb73fc22d973c84441.tar.gz cachepc-linux-bfdc8dbdf840f2a96d7b4cbb73fc22d973c84441.zip | |
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-06-18
Here's the final bluetooth-next pull request for 4.2.
- Cleanups & fixes to 802.15.4 code and related drivers
- Fix btusb driver memory leak
- New USB IDs for Atheros controllers
- Support for BCM4324B3 UART based Broadcom controller
- Fix for Bluetooth encryption key size handling
- Broadcom controller initialization fixes
- Support for Intel controller DDC parameters
- Support for multiple Bluetooth LE advertising instances
- Fix for HCI user channel cleanup path
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/Makefile')
| -rw-r--r-- | net/bluetooth/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile index 9a8ea232d28f..29c12ae72a66 100644 --- a/net/bluetooth/Makefile +++ b/net/bluetooth/Makefile @@ -12,9 +12,10 @@ obj-$(CONFIG_BT_6LOWPAN) += bluetooth_6lowpan.o bluetooth_6lowpan-y := 6lowpan.o bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \ - hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \ + hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o lib.o \ a2mp.o amp.o ecc.o hci_request.o mgmt_util.o +bluetooth-$(CONFIG_BT_BREDR) += sco.o bluetooth-$(CONFIG_BT_DEBUGFS) += hci_debugfs.o bluetooth-$(CONFIG_BT_SELFTEST) += selftest.o |