Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / m68k / mm / init.c

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index b09a3cb29b68fda44ba224fda84743bdfaaeded2..a6ffead9bef5df15cfc0f473f0be2cc853f4cf80 100644 (file)
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -20,7 +20,7 @@
 #include <linux/gfp.h>
 
 #include <asm/setup.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
 #include <asm/traps.h>
@@ -66,7 +66,7 @@ void __init m68k_setup_node(int node)
        end = (unsigned long)phys_to_virt(info->addr + info->size - 1) >> __virt_to_node_shift();
        for (; i <= end; i++) {
                if (pg_data_table[i])
-                       printk("overlap at %u for chunk %u\n", i, node);
+                       pr_warn("overlap at %u for chunk %u\n", i, node);
                pg_data_table[i] = pg_data_map + node;
        }
 #endif