diff --git a/[refs] b/[refs]
index eb750dcded1e..7df3914769d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f0e17f78471857104a20dfc57711409f68d7bf
+refs/heads/master: 0a708f8fc46fde3be2116b8d79f7469a24097c90
diff --git a/trunk/net/bluetooth/Makefile b/trunk/net/bluetooth/Makefile
index 250f954f0213..bf2945e1d9ef 100644
--- a/trunk/net/bluetooth/Makefile
+++ b/trunk/net/bluetooth/Makefile
@@ -11,3 +11,4 @@ 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
+l2cap-y := l2cap_core.o
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap_core.c
similarity index 100%
rename from trunk/net/bluetooth/l2cap.c
rename to trunk/net/bluetooth/l2cap_core.c