Merge branch 'linus' into x86/urgent

[linux-2.6] / arch / cris / mm / init.c

diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index 4207a2b527504d33cd4c72f28fc7f1d3d31effd9..5b06ffa15e347868c8ddfa5c796744b42fa4db3e 100644 (file)
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -27,7 +27,6 @@ show_mem(void)
 
        printk("\nMem-info:\n");
        show_free_areas();
-       printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
        i = max_mapnr;
        while (i-- > 0) {
                total++;