diff -urpN -X linux-2.6.22-git16-moves1/Documentation/dontdiff linux-2.6.22-git16-moves1/drivers/rtc/rtc-s3c.c linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/rtc/rtc-s3c.c
--- linux-2.6.22-git16-moves1/drivers/rtc/rtc-s3c.c	2007-07-09 23:36:20.000000000 +0100
+++ linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/rtc/rtc-s3c.c	2007-07-22 13:49:00.000000000 +0100
@@ -29,7 +29,7 @@
 
 #include <asm/mach/time.h>
 
-#include <asm/arch/regs-rtc.h>
+#include <asm/plat-s3c/regs-rtc.h>
 
 /* I have yet to find an S3C implementation with more than one
  * of these rtc blocks in */