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

[cascardo/linux.git] / arch / mips / txx9 / generic / setup_tx4939.c

diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index b7eccbd..e3733cd 100644 (file)
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -35,8 +35,8 @@ static void __init tx4939_wdr_init(void)
 {
        /* report watchdog reset status */
        if (____raw_readq(&tx4939_ccfgptr->ccfg) & TX4939_CCFG_WDRST)
-               pr_warning("Watchdog reset detected at 0x%lx\n",
-                          read_c0_errorepc());
+               pr_warn("Watchdog reset detected at 0x%lx\n",
+                       read_c0_errorepc());
        /* clear WatchDogReset (W1C) */
        tx4939_ccfg_set(TX4939_CCFG_WDRST);
        /* do reset on watchdog */