diff -urpN -X linux-2.6.22-git16-moves1/Documentation/dontdiff linux-2.6.22-git16-moves1/drivers/i2c/busses/i2c-s3c2410.c linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/i2c/busses/i2c-s3c2410.c
--- linux-2.6.22-git16-moves1/drivers/i2c/busses/i2c-s3c2410.c	2007-07-09 23:36:21.000000000 +0100
+++ linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/i2c/busses/i2c-s3c2410.c	2007-07-22 13:49:00.000000000 +0100
@@ -39,8 +39,8 @@
 #include <asm/io.h>
 
 #include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-iic.h>
-#include <asm/arch/iic.h>
+#include <asm/plat-s3c/regs-iic.h>
+#include <asm/plat-s3c/iic.h>
 
 /* i2c controller state */