diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-28 15:49:24 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-28 15:49:24 -0200 |
| commit | de5144164f6242ccfa8c9b64eec570564f5eaf14 (patch) | |
| tree | 56ea0f4e21ca74b14e1546e70ac92617dfb27dd1 /include/net | |
| parent | 8ed575904373d7aaab7f15a8db2edc317a44df43 (diff) | |
| parent | 245dc3d19b6ff7db42c9f3cca9006c8db59e2dee (diff) | |
| download | op-kernel-dev-de5144164f6242ccfa8c9b64eec570564f5eaf14.zip op-kernel-dev-de5144164f6242ccfa8c9b64eec570564f5eaf14.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 6 | ||||
| -rw-r--r-- | include/net/bluetooth/rfcomm.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 2104586..e42d728 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -171,4 +171,10 @@ static inline int skb_frags_no(struct sk_buff *skb) int bt_err(__u16 code); +extern int hci_sock_init(void); +extern int hci_sock_cleanup(void); + +extern int bt_sysfs_init(void); +extern void bt_sysfs_cleanup(void); + #endif /* __BLUETOOTH_H */ diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index fbe557f..e656be7 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h @@ -275,9 +275,6 @@ static inline void rfcomm_session_hold(struct rfcomm_session *s) atomic_inc(&s->refcnt); } -/* ---- RFCOMM chechsum ---- */ -extern u8 rfcomm_crc_table[]; - /* ---- RFCOMM sockets ---- */ struct sockaddr_rc { sa_family_t rc_family; |
