diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-28 13:49:24 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-28 13:49:24 -0400 |
commit | de5144164f6242ccfa8c9b64eec570564f5eaf14 (patch) | |
tree | 56ea0f4e21ca74b14e1546e70ac92617dfb27dd1 /net/bluetooth/af_bluetooth.c | |
parent | 8ed575904373d7aaab7f15a8db2edc317a44df43 (diff) | |
parent | 245dc3d19b6ff7db42c9f3cca9006c8db59e2dee (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
-rw-r--r-- | net/bluetooth/af_bluetooth.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 12b43345b54f..03532062a46a 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
@@ -308,12 +308,6 @@ static struct net_proto_family bt_sock_family_ops = { | |||
308 | .create = bt_sock_create, | 308 | .create = bt_sock_create, |
309 | }; | 309 | }; |
310 | 310 | ||
311 | extern int hci_sock_init(void); | ||
312 | extern int hci_sock_cleanup(void); | ||
313 | |||
314 | extern int bt_sysfs_init(void); | ||
315 | extern int bt_sysfs_cleanup(void); | ||
316 | |||
317 | static int __init bt_init(void) | 311 | static int __init bt_init(void) |
318 | { | 312 | { |
319 | BT_INFO("Core ver %s", VERSION); | 313 | BT_INFO("Core ver %s", VERSION); |