diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-02 08:17:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-02 08:17:56 +0200 |
| commit | 936e894a976dd3b0f07f1f6f43c17b77b7e6146d (patch) | |
| tree | 5ed5c1f6735dcd26550594df23c8f7fe2aa21a15 /drivers/watchdog/ks8695_wdt.c | |
| parent | 69575d388603365f2afbf4166df93152df59b165 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
| download | blackbird-op-linux-936e894a976dd3b0f07f1f6f43c17b77b7e6146d.tar.gz blackbird-op-linux-936e894a976dd3b0f07f1f6f43c17b77b7e6146d.zip | |
Merge commit 'v2.6.31-rc8' into x86/txt
Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig
Merge reason: resolve the conflicts, bump up from rc3 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/watchdog/ks8695_wdt.c')
| -rw-r--r-- | drivers/watchdog/ks8695_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index 00b03eb43bf0..e1c82769b08e 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c @@ -66,7 +66,7 @@ static inline void ks8695_wdt_stop(void) static inline void ks8695_wdt_start(void) { unsigned long tmcon; - unsigned long tval = wdt_time * CLOCK_TICK_RATE; + unsigned long tval = wdt_time * KS8695_CLOCK_RATE; spin_lock(&ks8695_lock); /* disable timer0 */ @@ -103,7 +103,7 @@ static inline void ks8695_wdt_reload(void) static int ks8695_wdt_settimeout(int new_time) { /* - * All counting occurs at SLOW_CLOCK / 128 = 0.256 Hz + * All counting occurs at KS8695_CLOCK_RATE / 128 = 0.256 Hz * * Since WDV is a 16-bit counter, the maximum period is * 65536 / 0.256 = 256 seconds. |
