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

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

diff --git a/arch/arm/kernel/atags_compat.c b/arch/arm/kernel/atags_compat.c
index 5236ad38f417996e837ac45f4f9b4ae237c98c72..05c28b12353c2e32702f696ef72695d4e4716df4 100644 (file)
--- a/arch/arm/kernel/atags_compat.c
+++ b/arch/arm/kernel/atags_compat.c
@@ -97,8 +97,7 @@ static void __init build_tag_list(struct param_struct *params, void *taglist)
        struct tag *tag = taglist;
 
        if (params->u1.s.page_size != PAGE_SIZE) {
-               printk(KERN_WARNING "Warning: bad configuration page, "
-                      "trying to continue\n");
+               pr_warn("Warning: bad configuration page, trying to continue\n");
                return;
        }
 
@@ -109,8 +108,7 @@ static void __init build_tag_list(struct param_struct *params, void *taglist)
            params->u1.s.nr_pages != 0x04000 &&
            params->u1.s.nr_pages != 0x08000 &&
            params->u1.s.nr_pages != 0x10000) {
-               printk(KERN_WARNING "Warning: bad NeTTrom parameters "
-                      "detected, using defaults\n");
+               pr_warn("Warning: bad NeTTrom parameters detected, using defaults\n");
 
                params->u1.s.nr_pages = 0x1000; /* 16MB */
                params->u1.s.ramdisk_size = 0;