Merge branch 'akpm/master'

[karo-tx-linux.git] / include / linux / node.h

diff --git a/include/linux/node.h b/include/linux/node.h
index 624e53cecc0298a70b6393ff4a262ae0935af727..2115ad5d6f1947a18185a59742293a52aab2a7a5 100644 (file)
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -27,10 +27,9 @@ struct node {
 };
 
 struct memory_block;
-extern struct node node_devices[];
+extern struct node *node_devices[];
 typedef  void (*node_registration_func_t)(struct node *);
 
-extern int register_node(struct node *, int, struct node *);
 extern void unregister_node(struct node *node);
 #ifdef CONFIG_NUMA
 extern int register_one_node(int nid);