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/net_namespace.h | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 708009be88b6..700c53a3c6fa 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
| @@ -214,6 +214,8 @@ struct pernet_operations { | |||
| 214 | 214 | ||
| 215 | extern int register_pernet_subsys(struct pernet_operations *); | 215 | extern int register_pernet_subsys(struct pernet_operations *); |
| 216 | extern void unregister_pernet_subsys(struct pernet_operations *); | 216 | extern void unregister_pernet_subsys(struct pernet_operations *); |
| 217 | extern int register_pernet_gen_subsys(int *id, struct pernet_operations *); | ||
| 218 | extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *); | ||
| 217 | extern int register_pernet_device(struct pernet_operations *); | 219 | extern int register_pernet_device(struct pernet_operations *); |
| 218 | extern void unregister_pernet_device(struct pernet_operations *); | 220 | extern void unregister_pernet_device(struct pernet_operations *); |
| 219 | extern int register_pernet_gen_device(int *id, struct pernet_operations *); | 221 | extern int register_pernet_gen_device(int *id, struct pernet_operations *); |