summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-05 06:31:29 +0200
committerDavid S. Miller <davem@davemloft.net>2009-05-05 06:31:29 +0200
commitbc83871e8325bb17da2930a76c2a3806377a76c5 (patch)
treeaf43c8f91eb05c92c609ddcaec26eb8f23155bc4 /include
parente1000: fix virtualization bug (diff)
parentBluetooth: Fix issue with sysfs handling for connections (diff)
downloadlinux-bc83871e8325bb17da2930a76c2a3806377a76c5.tar.xz
linux-bc83871e8325bb17da2930a76c2a3806377a76c5.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci_core.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index be5bd713d2c9..73aead222b32 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -457,6 +457,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
int hci_register_sysfs(struct hci_dev *hdev);
void hci_unregister_sysfs(struct hci_dev *hdev);
+void hci_conn_init_sysfs(struct hci_conn *conn);
void hci_conn_add_sysfs(struct hci_conn *conn);
void hci_conn_del_sysfs(struct hci_conn *conn);