diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/net/genetlink.h | |
| parent | 24d01c0681bfbc10a99304c48a89ad213d2d7a4b (diff) | |
| parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) | |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/net/genetlink.h')
| -rw-r--r-- | include/net/genetlink.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 747c255d1df0..1b0e3ee4ddd8 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h | |||
| @@ -88,6 +88,8 @@ struct genl_ops | |||
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | extern int genl_register_family(struct genl_family *family); | 90 | extern int genl_register_family(struct genl_family *family); |
| 91 | extern int genl_register_family_with_ops(struct genl_family *family, | ||
| 92 | struct genl_ops *ops, size_t n_ops); | ||
| 91 | extern int genl_unregister_family(struct genl_family *family); | 93 | extern int genl_unregister_family(struct genl_family *family); |
| 92 | extern int genl_register_ops(struct genl_family *, struct genl_ops *ops); | 94 | extern int genl_register_ops(struct genl_family *, struct genl_ops *ops); |
| 93 | extern int genl_unregister_ops(struct genl_family *, struct genl_ops *ops); | 95 | extern int genl_unregister_ops(struct genl_family *, struct genl_ops *ops); |