Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index cbcc43a..7efc0a7 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -135,7 +135,7 @@ int create_memory_block_devices(unsigned long start, unsigned long size,
 void remove_memory_block_devices(unsigned long start, unsigned long size);
 extern void memory_dev_init(void);
 extern int memory_notify(unsigned long val, void *v);
-extern struct memory_block *find_memory_block(struct mem_section *);
+extern struct memory_block *find_memory_block(unsigned long section_nr);
 typedef int (*walk_memory_blocks_func_t)(struct memory_block *, void *);
 extern int walk_memory_blocks(unsigned long start, unsigned long size,
                              void *arg, walk_memory_blocks_func_t func);