diff -urpN -X linux-2.6.22-git16-moves1/Documentation/dontdiff linux-2.6.22-git16-moves1/drivers/spi/spi_s3c24xx.c linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/spi/spi_s3c24xx.c
--- linux-2.6.22-git16-moves1/drivers/spi/spi_s3c24xx.c	2007-07-21 15:13:30.000000000 +0100
+++ linux-2.6.22-git16-moves1-fixups-split-moves2-fixup/drivers/spi/spi_s3c24xx.c	2007-07-22 14:21:50.000000000 +0100
@@ -28,7 +28,7 @@
 #include <asm/hardware.h>
 
 #include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-spi.h>
+#include <asm/plat-s3c24xx/regs-spi.h>
 #include <asm/arch/spi.h>
 
 struct s3c24xx_spi {