diff -urpN -X linux-2.6.22-git16-moves1/Documentation/dontdiff linux-2.6.22-git16-moves1/drivers/char/watchdog/s3c2410_wdt.c linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/char/watchdog/s3c2410_wdt.c
--- linux-2.6.22-git16-moves1/drivers/char/watchdog/s3c2410_wdt.c	2007-07-21 15:13:27.000000000 +0100
+++ linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/char/watchdog/s3c2410_wdt.c	2007-07-22 13:49:14.000000000 +0100
@@ -52,10 +52,10 @@
 
 #include <asm/arch/map.h>
 
-#undef S3C24XX_VA_WATCHDOG
-#define S3C24XX_VA_WATCHDOG (0)
+#undef S3C_VA_WATCHDOG
+#define S3C_VA_WATCHDOG (0)
 
-#include <asm/arch/regs-watchdog.h>
+#include <asm/plat-s3c/regs-watchdog.h>
 
 #define PFX "s3c2410-wdt: "