diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-13 15:12:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 15:12:07 -0400 |
| commit | ec8eb9ae5819da011ac574aa290207a2a47cdbae (patch) | |
| tree | ff7045c38e56624fd886837620a54daf54b6ba2a /net/bluetooth/Makefile | |
| parent | 9330969b8fd1304fdcb7c1825f1528eea38d321c (diff) | |
| parent | 1d0c4da8f717937aeda47a72bc769d80f8776795 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
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 2dc5a5700f53..fa6d94a4602a 100644 --- a/net/bluetooth/Makefile +++ b/net/bluetooth/Makefile @@ -9,4 +9,5 @@ obj-$(CONFIG_BT_CMTP) += cmtp/ obj-$(CONFIG_BT_HIDP) += hidp/ 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 sco.o lib.o \ + a2mp.o |