git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
net
/
batman-adv
/
icmp_socket.c
diff --git
a/net/batman-adv/icmp_socket.c
b/net/batman-adv/icmp_socket.c
index bded31121d122e7d9053fc0731e9b61c9efef73c..a98e0a986cefe5c20434c2ab0a028a423bd1229d 100644
(file)
--- a/
net/batman-adv/icmp_socket.c
+++ b/
net/batman-adv/icmp_socket.c
@@
-292,7
+292,7
@@
out:
return len;
}
-static
unsigned in
t batadv_socket_poll(struct file *file, poll_table *wait)
+static
__poll_
t batadv_socket_poll(struct file *file, poll_table *wait)
{
struct batadv_socket_client *socket_client = file->private_data;