diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/drivers/char/watchdog/s3c2410_wdt.c linux-2.6.17-rc1-s3c2442-3/drivers/char/watchdog/s3c2410_wdt.c
--- linux-2.6.17-rc1-uartupd2/drivers/char/watchdog/s3c2410_wdt.c	2006-03-20 05:53:29.000000000 +0000
+++ linux-2.6.17-rc1-s3c2442-3/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;
diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/drivers/serial/s3c2410.c linux-2.6.17-rc1-s3c2442-3/drivers/serial/s3c2410.c
--- linux-2.6.17-rc1-uartupd2/drivers/serial/s3c2410.c	2006-04-03 13:03:39.000000000 +0100
+++ linux-2.6.17-rc1-s3c2442-3/drivers/serial/s3c2410.c	2006-04-11 01:14:02.000000000 +0100
@@ -1365,7 +1365,7 @@ static inline void s3c2410_serial_exit(v
 
 #endif /* CONFIG_CPU_S3C2410 */
 
-#ifdef CONFIG_CPU_S3C2440
+#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
 
 static int s3c2440_serial_setsource(struct uart_port *port,
 				     struct s3c24xx_uart_clksrc *clk)