summaryrefslogtreecommitdiffstats
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
commitfd811bf54ced0e0ff4c1c02720a0f116fff21b4d (patch)
tree4041f1a7dfc40620ac439b37c4e65abb7dad3b1a /target/linux/brcm47xx/files/arch
parentaf03fdb6c5d9f94ec372cc9764a17b7d43a8edb0 (diff)
downloadmaster-31e0f0ae-fd811bf54ced0e0ff4c1c02720a0f116fff21b4d.tar.gz
master-31e0f0ae-fd811bf54ced0e0ff4c1c02720a0f116fff21b4d.tar.bz2
master-31e0f0ae-fd811bf54ced0e0ff4c1c02720a0f116fff21b4d.zip
sync ssb with upstream
SVN-Revision: 9302
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();
}