sync ssb with upstream

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / files / arch / mips / bcm947xx / setup.c

diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
index 106d8f54d4937680780a654a0b746e4288248fc9..780134818ed5ec0f5143f8abf6eb6a40869a428e 100644 (file)
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
+++ b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
@@ -55,7 +55,7 @@ static void bcm47xx_machine_restart(char *command)
         */
 
        /* Set the watchdog timer to reset immediately */
-       ssb_chipco_watchdog(&ssb.chipco, 1);
+       ssb_chipco_watchdog_timer_set(&ssb.chipco, 1);
        while (1)
                cpu_relax();
 }
@@ -64,7 +64,7 @@ static void bcm47xx_machine_halt(void)
 {
        /* Disable interrupts and watchdog and spin forever */
        local_irq_disable();
-       ssb_chipco_watchdog(&ssb.chipco, 0);
+       ssb_chipco_watchdog_timer_set(&ssb.chipco, 0);
        while (1)
                cpu_relax();
 }