git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
net
/
bluetooth
/
hidp
/
sock.c
diff --git
a/net/bluetooth/hidp/sock.c
b/net/bluetooth/hidp/sock.c
index
4beb6a7
..
9cfef68
100644
(file)
--- a/
net/bluetooth/hidp/sock.c
+++ b/
net/bluetooth/hidp/sock.c
@@
-241,7
+241,8
@@
static struct proto hidp_proto = {
.obj_size = sizeof(struct bt_sock)
};
-static int hidp_sock_create(struct net *net, struct socket *sock, int protocol)
+static int hidp_sock_create(struct net *net, struct socket *sock, int protocol,
+ int kern)
{
struct sock *sk;