Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index a4f6d3f..941ad7c 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -973,7 +973,6 @@ extern void sock_init_data(struct socket *sock, struct sock *sk);
 
 /**
  *     sk_filter_release: Release a socket filter
- *     @sk: socket
  *     @fp: filter to remove
  *
  *     Remove a filter from a socket and release its resources.