diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /fs/dlm/netlink.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'fs/dlm/netlink.c')
| -rw-r--r-- | fs/dlm/netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c index 714593621f4f..18bda83cc892 100644 --- a/fs/dlm/netlink.c +++ b/fs/dlm/netlink.c | |||
| @@ -95,7 +95,7 @@ int __init dlm_netlink_init(void) | |||
| 95 | return rv; | 95 | return rv; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | void __exit dlm_netlink_exit(void) | 98 | void dlm_netlink_exit(void) |
| 99 | { | 99 | { |
| 100 | genl_unregister_ops(&family, &dlm_nl_ops); | 100 | genl_unregister_ops(&family, &dlm_nl_ops); |
| 101 | genl_unregister_family(&family); | 101 | genl_unregister_family(&family); |