]> Pileus Git - ~andy/linux/commit
Bluetooth: fix build break on hci_sock.c
authorAnand Gadiyar <gadiyar@ti.com>
Tue, 22 Feb 2011 07:13:09 +0000 (12:43 +0530)
committerGustavo F. Padovan <padovan@profusion.mobi>
Tue, 22 Feb 2011 11:43:52 +0000 (08:43 -0300)
commitb7440a14f28492bac30d7d43fd982fd210c6e971
tree4da1c312879b0396be8456f731bea0aabc720b3e
parent15c4794fe247d85ce38eb5f5e2a5855d996f56cd
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>
net/bluetooth/hci_sock.c