diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
| commit | 6469f540ea37d53db089c8fea9c0c77a3d9353d4 (patch) | |
| tree | 1dc9dc077150d57f4424cae49e711b5dd6e903a1 /drivers/watchdog/coh901327_wdt.c | |
| parent | 304e6d5fe294b80e6d3107f99ec241816390ebcc (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
Diffstat (limited to 'drivers/watchdog/coh901327_wdt.c')
| -rw-r--r-- | drivers/watchdog/coh901327_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c index aec7cefdef21..381026c0bd7b 100644 --- a/drivers/watchdog/coh901327_wdt.c +++ b/drivers/watchdog/coh901327_wdt.c | |||
| @@ -110,7 +110,7 @@ static void coh901327_enable(u16 timeout) | |||
| 110 | * Wait 3 32 kHz cycles for it to take effect | 110 | * Wait 3 32 kHz cycles for it to take effect |
| 111 | */ | 111 | */ |
| 112 | freq = clk_get_rate(clk); | 112 | freq = clk_get_rate(clk); |
| 113 | delay_ns = (1000000000 + freq - 1) / freq; /* Freq to ns and round up */ | 113 | delay_ns = DIV_ROUND_UP(1000000000, freq); /* Freq to ns and round up */ |
| 114 | delay_ns = 3 * delay_ns; /* Wait 3 cycles */ | 114 | delay_ns = 3 * delay_ns; /* Wait 3 cycles */ |
| 115 | ndelay(delay_ns); | 115 | ndelay(delay_ns); |
| 116 | /* Enable the watchdog interrupt */ | 116 | /* Enable the watchdog interrupt */ |