diff options
Diffstat (limited to 'arch/powerpc/cpu')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 18 | 
1 files changed, 10 insertions, 8 deletions
| diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index df2ab6d73..6ce483e17 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -282,14 +282,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 */  /* |