projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
net
/
bluetooth
/
sco.c
diff --git
a/net/bluetooth/sco.c
b/net/bluetooth/sco.c
index
ce7ab7d
..
997e42d
100644
(file)
--- a/
net/bluetooth/sco.c
+++ b/
net/bluetooth/sco.c
@@
-418,7
+418,7
@@
static struct proto sco_proto = {
.obj_size = sizeof(struct sco_pinfo)
};
-static struct sock *sco_sock_alloc(struct socket *sock, int proto,
unsigned int __nocas
t prio)
+static struct sock *sco_sock_alloc(struct socket *sock, int proto,
gfp_
t prio)
{
struct sock *sk;