]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
mpc85xx: Fix a compiler warning when CONFIG_WATCHDOG is turned on
authorHorst Kronstorfer <hkronsto@frequentis.com>
Wed, 13 Mar 2013 10:14:05 +0000 (10:14 +0000)
committerAndy Fleming <afleming@freescale.com>
Thu, 2 May 2013 21:56:44 +0000 (16:56 -0500)
cpu.c:288:2:
warning: implicit declaration of function 'reset_85xx_watchdog'
[-Wimplicit-function-declaration]

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
arch/powerpc/cpu/mpc85xx/cpu.c

index df2ab6d73cbd73a3872c5263233483f3a277da41..6ce483e17ae46eb69a29101f676af2c9f7420fe4 100644 (file)
@@ -281,14 +281,6 @@ unsigned long get_tbclk (void)
 
 
 #if defined(CONFIG_WATCHDOG)
-void
-watchdog_reset(void)
-{
-       int re_enable = disable_interrupts();
-       reset_85xx_watchdog();
-       if (re_enable) enable_interrupts();
-}
-
 void
 reset_85xx_watchdog(void)
 {
@@ -297,6 +289,16 @@ reset_85xx_watchdog(void)
         */
        mtspr(SPRN_TSR, TSR_WIS);
 }
+
+void
+watchdog_reset(void)
+{
+       int re_enable = disable_interrupts();
+
+       reset_85xx_watchdog();
+       if (re_enable)
+               enable_interrupts();
+}
 #endif /* CONFIG_WATCHDOG */
 
 /*