Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[sfrench/cifs-2.6.git] / arch / sparc / mm / init_32.c

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 6d0e02c4fe09cdc318d6da849668495546d21897..4c31e2b6e71b8bd49451ab2d6f4381e82bfbd9ae 100644 (file)
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -75,7 +75,7 @@ void __init kmap_init(void)
        kmap_prot = __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE);
 }
 
-void show_mem(void)
+void show_mem(unsigned int filter)
 {
        printk("Mem-info:\n");
        show_free_areas();