Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[linux-2.6-omap-h63xx.git] / arch / arm / mm / mm.h

diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index 66f8612c5e5b9cdbab3127013b65a16c0a264d2e..95bbe112965e1a53953eb2a224c6418805876d7e 100644 (file)
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -32,5 +32,5 @@ struct meminfo;
 struct pglist_data;
 
 void __init create_mapping(struct map_desc *md);
-void __init bootmem_init(struct meminfo *mi);
+void __init bootmem_init(void);
 void reserve_node_zero(struct pglist_data *pgdat);