提交 b7440a14 编写于 作者: A Anand Gadiyar 提交者: Gustavo F. Padovan

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: NAnand Gadiyar <gadiyar@ti.com>
Signed-off-by: NGustavo F. Padovan <padovan@profusion.mobi>
上级 15c4794f
......@@ -861,7 +861,7 @@ int __init hci_sock_init(void)
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");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册