Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / arch / arm / kernel / atags_parse.c

diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c
index 528f8af2addb2a194de2d578032db1781a69dc7c..68c6ae0b9e4ca0f2e64aaadc1d9865708de93655 100644 (file)
--- a/arch/arm/kernel/atags_parse.c
+++ b/arch/arm/kernel/atags_parse.c
@@ -167,8 +167,7 @@ static void __init parse_tags(const struct tag *t)
 {
        for (; t->hdr.size; t = tag_next(t))
                if (!parse_tag(t))
-                       printk(KERN_WARNING
-                               "Ignoring unrecognised tag 0x%08x\n",
+                       pr_warn("Ignoring unrecognised tag 0x%08x\n",
                                t->hdr.tag);
 }
 
@@ -193,7 +192,7 @@ setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr)
         */
        for_each_machine_desc(p)
                if (machine_nr == p->nr) {
-                       printk("Machine: %s\n", p->name);
+                       pr_info("Machine: %s\n", p->name);
                        mdesc = p;
                        break;
                }