diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /net/bluetooth/sco.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'net/bluetooth/sco.c')
| -rw-r--r-- | net/bluetooth/sco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 746c11fc017e..ce7ab7dfa0b2 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
| @@ -418,7 +418,7 @@ static struct proto sco_proto = { | |||
| 418 | .obj_size = sizeof(struct sco_pinfo) | 418 | .obj_size = sizeof(struct sco_pinfo) |
| 419 | }; | 419 | }; |
| 420 | 420 | ||
| 421 | static struct sock *sco_sock_alloc(struct socket *sock, int proto, int prio) | 421 | static struct sock *sco_sock_alloc(struct socket *sock, int proto, unsigned int __nocast prio) |
| 422 | { | 422 | { |
| 423 | struct sock *sk; | 423 | struct sock *sk; |
| 424 | 424 | ||