From 07d1382d4f68ab949d62df790ba6b038a79b5042 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 30 Oct 2008 10:14:38 +0000
Subject: [PATCH] --- yaml --- r: 123603 b: refs/heads/master c:
 13622708725990b01fbc6d59d54d93820a726d7c h: refs/heads/master i:   123601:
 ad36730cc7d09aed10ab175ba52d810b6b74fc9c   123599:
 462c64c8cf533bde0c22d28ce72debec634e023f v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/arm/mach-s3c2410/dma.c                               | 2 +-
 trunk/arch/arm/mach-s3c2412/dma.c                               | 2 +-
 trunk/arch/arm/mach-s3c2412/s3c2412.c                           | 2 +-
 trunk/arch/arm/mach-s3c2440/dma.c                               | 2 +-
 trunk/arch/arm/mach-s3c2443/dma.c                               | 2 +-
 trunk/arch/arm/plat-s3c24xx/devs.c                              | 2 +-
 .../arm/plat-s3c24xx/include/plat}/regs-spi.h                   | 0
 trunk/drivers/spi/spi_s3c24xx.c                                 | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/{include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/regs-spi.h (100%)

diff --git a/[refs] b/[refs]
index a91306cfc2ef..d0173e0da78f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57bd4b91a6cfc5bad4c5d829ef85293ea63643ea
+refs/heads/master: 13622708725990b01fbc6d59d54d93820a726d7c
diff --git a/trunk/arch/arm/mach-s3c2410/dma.c b/trunk/arch/arm/mach-s3c2410/dma.c
index 7fa77effccf8..30983cc612df 100644
--- a/trunk/arch/arm/mach-s3c2410/dma.c
+++ b/trunk/arch/arm/mach-s3c2410/dma.c
@@ -30,7 +30,7 @@
 #include <mach/regs-lcd.h>
 #include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
 
 static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
 	[DMACH_XD0] = {
diff --git a/trunk/arch/arm/mach-s3c2412/dma.c b/trunk/arch/arm/mach-s3c2412/dma.c
index 7db581826676..f8b2dd4a3632 100644
--- a/trunk/arch/arm/mach-s3c2412/dma.c
+++ b/trunk/arch/arm/mach-s3c2412/dma.c
@@ -32,7 +32,7 @@
 #include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
 
 #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }
 
diff --git a/trunk/arch/arm/mach-s3c2412/s3c2412.c b/trunk/arch/arm/mach-s3c2412/s3c2412.c
index 313759c3da69..a086818e117e 100644
--- a/trunk/arch/arm/mach-s3c2412/s3c2412.c
+++ b/trunk/arch/arm/mach-s3c2412/s3c2412.c
@@ -39,7 +39,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpioj.h>
 #include <mach/regs-dsc.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
 #include <mach/regs-s3c2412.h>
 
 #include <plat/s3c2412.h>
diff --git a/trunk/arch/arm/mach-s3c2440/dma.c b/trunk/arch/arm/mach-s3c2440/dma.c
index 00d88782b23b..53be553bfc21 100644
--- a/trunk/arch/arm/mach-s3c2440/dma.c
+++ b/trunk/arch/arm/mach-s3c2440/dma.c
@@ -30,7 +30,7 @@
 #include <mach/regs-lcd.h>
 #include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
 
 static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
 	[DMACH_XD0] = {
diff --git a/trunk/arch/arm/mach-s3c2443/dma.c b/trunk/arch/arm/mach-s3c2443/dma.c
index 4185c57b5dd0..872482f02685 100644
--- a/trunk/arch/arm/mach-s3c2443/dma.c
+++ b/trunk/arch/arm/mach-s3c2443/dma.c
@@ -31,7 +31,7 @@
 #include <mach/regs-lcd.h>
 #include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
 
 #define MAP(x) { \
 		[0]	= (x) | DMA_CH_VALID,	\
diff --git a/trunk/arch/arm/plat-s3c24xx/devs.c b/trunk/arch/arm/plat-s3c24xx/devs.c
index 07491bcd13ba..adf535aaf43a 100644
--- a/trunk/arch/arm/plat-s3c24xx/devs.c
+++ b/trunk/arch/arm/plat-s3c24xx/devs.c
@@ -33,7 +33,7 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
 
 /* Serial port registrations */
 
diff --git a/trunk/include/asm-arm/plat-s3c24xx/regs-spi.h b/trunk/arch/arm/plat-s3c24xx/include/plat/regs-spi.h
similarity index 100%
rename from trunk/include/asm-arm/plat-s3c24xx/regs-spi.h
rename to trunk/arch/arm/plat-s3c24xx/include/plat/regs-spi.h
diff --git a/trunk/drivers/spi/spi_s3c24xx.c b/trunk/drivers/spi/spi_s3c24xx.c
index c252cbac00f1..256d18395a23 100644
--- a/trunk/drivers/spi/spi_s3c24xx.c
+++ b/trunk/drivers/spi/spi_s3c24xx.c
@@ -28,7 +28,7 @@
 #include <mach/hardware.h>
 
 #include <mach/regs-gpio.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
 #include <mach/spi.h>
 
 struct s3c24xx_spi {