diff -urpN -X ../dontdiff linux-2.6.17-rc1/drivers/char/watchdog/s3c2410_wdt.c linux-2.6.17-rc1-s3c2442-2/drivers/char/watchdog/s3c2410_wdt.c
--- linux-2.6.17-rc1/drivers/char/watchdog/s3c2410_wdt.c	2006-03-20 05:53:29.000000000 +0000
+++ linux-2.6.17-rc1-s3c2442-2/drivers/char/watchdog/s3c2410_wdt.c	2006-04-12 07:47:50.000000000 +0100
@@ -423,6 +423,12 @@ static int s3c2410wdt_probe(struct platf
 	if (tmr_atboot && started == 0) {
 		printk(KERN_INFO PFX "Starting Watchdog Timer\n");
 		s3c2410wdt_start();
+	} else if (!tmr_atboot) {
+		/* if we're not enabling the watchdog, then ensure it is
+		 * disabled if it has been left running from the bootloader
+		 * or other source */
+
+		s3c2410wdt_stop();
 	}
 
 	return 0;