Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / arm / mm / cache-feroceon-l2.c

diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index e028a7f..097181e 100644 (file)
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -313,7 +313,7 @@ static void __init disable_l2_prefetch(void)
         */
        u = read_extra_features();
        if (!(u & 0x01000000)) {
-               printk(KERN_INFO "Feroceon L2: Disabling L2 prefetch.\n");
+               pr_info("Feroceon L2: Disabling L2 prefetch.\n");
                write_extra_features(u | 0x01000000);
        }
 }
@@ -326,7 +326,7 @@ static void __init enable_l2(void)
        if (!(u & 0x00400000)) {
                int i, d;
 
-               printk(KERN_INFO "Feroceon L2: Enabling L2\n");
+               pr_info("Feroceon L2: Enabling L2\n");
 
                d = flush_and_disable_dcache();
                i = invalidate_and_disable_icache();
@@ -353,7 +353,7 @@ void __init feroceon_l2_init(int __l2_wt_override)
 
        enable_l2();
 
-       printk(KERN_INFO "Feroceon L2: Cache support initialised%s.\n",
+       pr_info("Feroceon L2: Cache support initialised%s.\n",
                         l2_wt_override ? ", in WT override mode" : "");
 }
 #ifdef CONFIG_OF