diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /include/net/sock.h | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
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 ada50c04d09f..c04f9e18ea22 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -936,7 +936,6 @@ extern void sock_init_data(struct socket *sock, struct sock *sk); | |||
| 936 | 936 | ||
| 937 | /** | 937 | /** |
| 938 | * sk_filter_release: Release a socket filter | 938 | * sk_filter_release: Release a socket filter |
| 939 | * @sk: socket | ||
| 940 | * @fp: filter to remove | 939 | * @fp: filter to remove |
| 941 | * | 940 | * |
| 942 | * Remove a filter from a socket and release its resources. | 941 | * Remove a filter from a socket and release its resources. |