summaryrefslogtreecommitdiff
path: root/net/bluetooth/Makefile
diff options
context:
space:
mode:
authorUlisses Furquim <ulisses@profusion.mobi>2011-12-21 03:32:09 (GMT)
committerGustavo F. Padovan <padovan@profusion.mobi>2011-12-21 04:21:08 (GMT)
commitf1e91e1640d808d332498a6b09b2bcd01462eff9 (patch)
tree0532037e97621e971bd1301d4bfd5b02e992c60e /net/bluetooth/Makefile
parentf2d64f6aa6c681ca00a71c2b3304ed80dc317752 (diff)
downloadlinux-f1e91e1640d808d332498a6b09b2bcd01462eff9.tar.xz
Bluetooth: Always compile SCO and L2CAP in Bluetooth Core
The handling of SCO audio links and the L2CAP protocol are essential to any system with Bluetooth thus are always compiled in from now on. Signed-off-by: Ulisses Furquim <ulisses@profusion.mobi> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/Makefile')
-rw-r--r--net/bluetooth/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index 9b67f3d..2dc5a570 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -8,6 +8,5 @@ obj-$(CONFIG_BT_BNEP) += bnep/
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 lib.o
-bluetooth-$(CONFIG_BT_L2CAP) += l2cap_core.o l2cap_sock.o smp.o
-bluetooth-$(CONFIG_BT_SCO) += sco.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