diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /include/net/sock.h | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (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.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index a4f6d3fc0470..941ad7c830a3 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); | |||
| 973 | 973 | ||
| 974 | /** | 974 | /** |
| 975 | * sk_filter_release: Release a socket filter | 975 | * sk_filter_release: Release a socket filter |
| 976 | * @sk: socket | ||
| 977 | * @fp: filter to remove | 976 | * @fp: filter to remove |
| 978 | * | 977 | * |
| 979 | * Remove a filter from a socket and release its resources. | 978 | * Remove a filter from a socket and release its resources. |