Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 440fd65..365cd4a 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -586,9 +586,9 @@ static struct memory_block *find_memory_block_by_id(unsigned long block_id)
 /*
  * Called under device_hotplug_lock.
  */
-struct memory_block *find_memory_block(struct mem_section *section)
+struct memory_block *find_memory_block(unsigned long section_nr)
 {
-       unsigned long block_id = memory_block_id(__section_nr(section));
+       unsigned long block_id = memory_block_id(section_nr);
 
        return find_memory_block_by_id(block_id);
 }