diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-19 00:30:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-19 00:30:39 -0700 |
| commit | 407d819cf0fd54c6fc1138a509225696aecafd15 (patch) | |
| tree | b653a5c8c09f7c316f5f98947be262e27a4ca33a /include/net/bluetooth/bluetooth.h | |
| parent | 7abbcd6a4c8d6179121f2915a761b1133bf1cd99 (diff) | |
| parent | b1235d79611e78a07629b4cbe53291c9cffd1834 (diff) | |
| download | blackbird-op-linux-407d819cf0fd54c6fc1138a509225696aecafd15.tar.gz blackbird-op-linux-407d819cf0fd54c6fc1138a509225696aecafd15.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 750648df13f4..6f8418bf4241 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -121,6 +121,7 @@ void bt_sock_link(struct bt_sock_list *l, struct sock *s); void bt_sock_unlink(struct bt_sock_list *l, struct sock *s); int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len, int flags); uint bt_sock_poll(struct file * file, struct socket *sock, poll_table *wait); +int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo); void bt_accept_enqueue(struct sock *parent, struct sock *sk); |
