Merge with 2.3.99-pre6.

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mm/mm-armo.c b/arch/arm/mm/mm-armo.c
index f4bf7cad5..dc1647a2d 100644
--- a/arch/arm/mm/mm-armo.c
+++ b/arch/arm/mm/mm-armo.c
@@ -147,7 +147,7 @@ void setup_mm_for_reboot(char mode)
  * some more work to get it to fit into our separate processor and
  * architecture structure.
  */
-void __init pagetable_init(void)
+void __init pagetable_init(struct meminfo *mi)
 {
 	pte_t *pte;
 	int i;
@@ -165,6 +165,6 @@ void __init pagetable_init(void)
 /*
  * We never have holes in the memmap
  */
-void __init create_memmap_holes(void)
+void __init create_memmap_holes(struct meminfo *mi)
 {
 }