diff --git a/[refs] b/[refs] index a4bd11824a4d..d87f95688765 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98a38ebdda69f1498be4f618d8d919695c8d6352 +refs/heads/master: 900b2b463dc6e65ec474d6880412c63c25b3aea9 diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c index 19fe93155fe6..58801d718cc2 100644 --- a/trunk/drivers/base/memory.c +++ b/trunk/drivers/base/memory.c @@ -62,8 +62,7 @@ void unregister_memory_notifier(struct notifier_block *nb) /* * register_memory - Setup a sysfs device for a memory block */ -static int -register_memory(struct memory_block *memory, struct mem_section *section, +int register_memory(struct memory_block *memory, struct mem_section *section, struct node *root) { int error;