diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-02-21 11:07:14 -0500 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-02-21 11:07:14 -0500 |
| commit | e29371d762df5bb35d2bc434ea266a046e5a0a75 (patch) | |
| tree | dac4a8db52d92453415f35606130a49e9f32e4ef /include/linux/node.h | |
| parent | 17b14ca25e9cd6c5cd7605941f6120e405a84f8b (diff) | |
| parent | 894e2ac82bd0029adce7ad6c8d25501fdd82c994 (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'include/linux/node.h')
| -rw-r--r-- | include/linux/node.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/node.h b/include/linux/node.h index 624e53cecc02..2115ad5d6f19 100644 --- a/include/linux/node.h +++ b/include/linux/node.h | |||
| @@ -27,10 +27,9 @@ struct node { | |||
| 27 | }; | 27 | }; |
| 28 | 28 | ||
| 29 | struct memory_block; | 29 | struct memory_block; |
| 30 | extern struct node node_devices[]; | 30 | extern struct node *node_devices[]; |
| 31 | typedef void (*node_registration_func_t)(struct node *); | 31 | typedef void (*node_registration_func_t)(struct node *); |
| 32 | 32 | ||
| 33 | extern int register_node(struct node *, int, struct node *); | ||
| 34 | extern void unregister_node(struct node *node); | 33 | extern void unregister_node(struct node *node); |
| 35 | #ifdef CONFIG_NUMA | 34 | #ifdef CONFIG_NUMA |
| 36 | extern int register_one_node(int nid); | 35 | extern int register_one_node(int nid); |
