summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAnand Gadiyar <gadiyar@ti.com>2011-02-22 12:43:09 +0530
committerGustavo F. Padovan <padovan@profusion.mobi>2011-02-22 08:43:52 -0300
commitb7440a14f28492bac30d7d43fd982fd210c6e971 (patch)
tree4da1c312879b0396be8456f731bea0aabc720b3e /net/bluetooth
parent15c4794fe247d85ce38eb5f5e2a5855d996f56cd (diff)
downloadlinux-stable-b7440a14f28492bac30d7d43fd982fd210c6e971.tar.gz
linux-stable-b7440a14f28492bac30d7d43fd982fd210c6e971.tar.bz2
linux-stable-b7440a14f28492bac30d7d43fd982fd210c6e971.zip
Bluetooth: fix build break on hci_sock.c
Linux-next as of 20110217 complains when building for OMAP1. LD vmlinux `hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o `hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o make: *** [vmlinux] Error 1 A recent patch by Gustavo (Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko) introduced this by calling the hci_sock_cleanup function in the error path of bt_init. Fix this by dropping the __exit marking for hci_sock_cleanup. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index d50e96136608..295e4a88fff8 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -861,7 +861,7 @@ error:
return err;
}
-void __exit hci_sock_cleanup(void)
+void hci_sock_cleanup(void)
{
if (bt_sock_unregister(BTPROTO_HCI) < 0)
BT_ERR("HCI socket unregistration failed");