vserver 2.0 rc7

[linux-2.6.git] / drivers / char / watchdog / s3c2410_wdt.c

diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index 47480f8..1699d2c 100644 (file)
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -26,6 +26,10 @@
  *     05-Oct-2004     BJD     Added semaphore init to stop crashes on open
  *                             Fixed tmr_count / wdt_count confusion
  *                             Added configurable debug
+ *
+ *     11-Jan-2004     BJD     Fixed divide-by-2 in timeout code
+ *
+ *     10-Mar-2005     LCVR    Changed S3C2410_VA to S3C24XX_VA
 */
 
 #include <linux/module.h>
@@ -48,8 +52,8 @@
 #include <asm/arch/map.h>
 #include <asm/hardware/clock.h>
 
-#undef S3C2410_VA_WATCHDOG
-#define S3C2410_VA_WATCHDOG (0)
+#undef S3C24XX_VA_WATCHDOG
+#define S3C24XX_VA_WATCHDOG (0)
 
 #include <asm/arch/regs-watchdog.h>
 
@@ -163,11 +167,7 @@ static int s3c2410wdt_set_heartbeat(int timeout)
        if (timeout < 1)
                return -EINVAL;
 
-       /* I think someone must have missed a divide-by-2 in the 2410,
-        * as a divisor of 128 gives half the calculated delay...
-        */
-
-       freq /= 128/2;
+       freq /= 128;
        count = timeout * freq;
 
        DBG("%s: count=%d, timeout=%d, freq=%d\n",