summaryrefslogtreecommitdiffstats
path: root/include/net/sock.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-31 00:17:34 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-31 00:17:34 -0700
commita1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch)
treec0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /include/net/sock.h
parent275f165fa970174f8a98205529750e8abb6c0a33 (diff)
parenta432226614c5616e3cfd211e0acffa0acfb4770c (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'include/net/sock.h')
-rw-r--r--include/net/sock.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index a4f6d3fc047..941ad7c830a 100644
--- 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.