aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/files/arch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-10-14 02:47:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-10-14 02:47:36 +0000
commit939d828c8fdf124ddf0ce4311808d6cae93b788b (patch)
tree2458e4ed779fe626b1c5335f2f5f411e277300a6 /target/linux/brcm47xx/files/arch
parent733e77839ddac4d606b3ec3505a57c2735a276b1 (diff)
downloadmaster-187ad058-939d828c8fdf124ddf0ce4311808d6cae93b788b.tar.gz
master-187ad058-939d828c8fdf124ddf0ce4311808d6cae93b788b.tar.bz2
master-187ad058-939d828c8fdf124ddf0ce4311808d6cae93b788b.zip
sync ssb with upstream
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9302 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/files/arch')
-rw-r--r--target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
index 106d8f54d4..780134818e 100644
--- 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();
}