diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /cpu/mcf532x/cpu.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-fsl-qoriq-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'cpu/mcf532x/cpu.c')
| -rw-r--r-- | cpu/mcf532x/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mcf532x/cpu.c b/cpu/mcf532x/cpu.c index 260d6e6..8c496a2 100644 --- a/cpu/mcf532x/cpu.c +++ b/cpu/mcf532x/cpu.c @@ -117,7 +117,7 @@ int watchdog_init(void) u32 wdog_module = 0; /* set timeout and enable watchdog */ - wdog_module = ((CFG_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT); + wdog_module = ((CONFIG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT); #ifdef CONFIG_M5329 wdp->mr = (wdog_module / 8192); #else |