diff options
| author | Grant Likely | 2012-03-12 16:41:28 +0100 |
|---|---|---|
| committer | Grant Likely | 2012-03-12 16:41:28 +0100 |
| commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
| tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /include/net/bluetooth/bluetooth.h | |
| parent | gpio/omap: Fix IRQ handling for SPARSE_IRQ (diff) | |
| parent | Linux 3.3-rc7 (diff) | |
| download | kernel-qcow2-linux-e2aa4177264c1a459779d6e35fae22adf17a9232.tar.gz kernel-qcow2-linux-e2aa4177264c1a459779d6e35fae22adf17a9232.tar.xz kernel-qcow2-linux-e2aa4177264c1a459779d6e35fae22adf17a9232.zip | |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index abaad6ed9b83..4a82ca0bb0b2 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -256,4 +256,6 @@ void l2cap_exit(void); int sco_init(void); void sco_exit(void); +void bt_sock_reclassify_lock(struct sock *sk, int proto); + #endif /* __BLUETOOTH_H */ |