diff --git a/[refs] b/[refs] index a858d7f4b1b0..529ab69b76c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 212a0a6f28dda0a1e732d20d57abb465750d473c +refs/heads/master: fa264375175a382621c5344a6508e02ec4d1c3c0 diff --git a/trunk/drivers/base/node.c b/trunk/drivers/base/node.c index 4282e82d9f26..fffed4c96bb3 100644 --- a/trunk/drivers/base/node.c +++ b/trunk/drivers/base/node.c @@ -277,7 +277,7 @@ static void node_device_release(struct device *dev) * * Initialize and register the node device. */ -int register_node(struct node *node, int num, struct node *parent) +static int register_node(struct node *node, int num, struct node *parent) { int error; diff --git a/trunk/include/linux/node.h b/trunk/include/linux/node.h index 10316f1c68a9..2115ad5d6f19 100644 --- a/trunk/include/linux/node.h +++ b/trunk/include/linux/node.h @@ -30,7 +30,6 @@ struct memory_block; 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);