diff -urpN -X linux-2.6.22-git16-moves1/Documentation/dontdiff linux-2.6.22-git16-moves1/drivers/mtd/nand/s3c2410.c linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/mtd/nand/s3c2410.c
--- linux-2.6.22-git16-moves1/drivers/mtd/nand/s3c2410.c	2007-07-09 23:36:21.000000000 +0100
+++ linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/mtd/nand/s3c2410.c	2007-07-22 13:49:00.000000000 +0100
@@ -60,8 +60,8 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/regs-nand.h>
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/regs-nand.h>
+#include <asm/plat-s3c/nand.h>
 
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 static int hardware_ecc = 1;