From d2dc111158ecc4818cd1445a1950c52cd2dc6f6a Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 30 Oct 2008 10:14:33 +0000
Subject: [PATCH] --- yaml --- r: 123598 b: refs/heads/master c:
 9498cb79463c9b2abb243a4b0c2ce3ac1853d5b0 h: refs/heads/master v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/arm/mach-s3c2410/mach-bast.c                       | 2 +-
 trunk/arch/arm/mach-s3c2410/mach-n30.c                        | 2 +-
 trunk/arch/arm/mach-s3c2412/mach-jive.c                       | 2 +-
 .../asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/iic.h | 0
 .../plat-s3c => arch/arm/plat-s3c/include/plat}/regs-iic.h    | 0
 trunk/drivers/i2c/busses/i2c-s3c2410.c                        | 4 ++--
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename trunk/{include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/iic.h (100%)
 rename trunk/{include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-iic.h (100%)

diff --git a/[refs] b/[refs]
index cb208b7607eb..6a6957d60e42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 180ee700ddfcc882d90410d979a4b3a804380ed2
+refs/heads/master: 9498cb79463c9b2abb243a4b0c2ce3ac1853d5b0
diff --git a/trunk/arch/arm/mach-s3c2410/mach-bast.c b/trunk/arch/arm/mach-s3c2410/mach-bast.c
index 8db9c700e3c2..8da05f9e7bb4 100644
--- a/trunk/arch/arm/mach-s3c2410/mach-bast.c
+++ b/trunk/arch/arm/mach-s3c2410/mach-bast.c
@@ -45,7 +45,7 @@
 #include <mach/regs-lcd.h>
 
 #include <asm/plat-s3c/nand.h>
-#include <asm/plat-s3c/iic.h>
+#include <plat/iic.h>
 #include <mach/fb.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/trunk/arch/arm/mach-s3c2410/mach-n30.c b/trunk/arch/arm/mach-s3c2410/mach-n30.c
index 82505517846c..836c9f639215 100644
--- a/trunk/arch/arm/mach-s3c2410/mach-n30.c
+++ b/trunk/arch/arm/mach-s3c2410/mach-n30.c
@@ -40,7 +40,7 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include <asm/plat-s3c/iic.h>
+#include <plat/iic.h>
 #include <plat/regs-serial.h>
 
 #include <plat/clock.h>
diff --git a/trunk/arch/arm/mach-s3c2412/mach-jive.c b/trunk/arch/arm/mach-s3c2412/mach-jive.c
index b08f18c8c47a..80208d37756d 100644
--- a/trunk/arch/arm/mach-s3c2412/mach-jive.c
+++ b/trunk/arch/arm/mach-s3c2412/mach-jive.c
@@ -32,7 +32,7 @@
 
 #include <plat/regs-serial.h>
 #include <asm/plat-s3c/nand.h>
-#include <asm/plat-s3c/iic.h>
+#include <plat/iic.h>
 
 #include <mach/regs-power.h>
 #include <mach/regs-gpio.h>
diff --git a/trunk/include/asm-arm/plat-s3c/iic.h b/trunk/arch/arm/plat-s3c/include/plat/iic.h
similarity index 100%
rename from trunk/include/asm-arm/plat-s3c/iic.h
rename to trunk/arch/arm/plat-s3c/include/plat/iic.h
diff --git a/trunk/include/asm-arm/plat-s3c/regs-iic.h b/trunk/arch/arm/plat-s3c/include/plat/regs-iic.h
similarity index 100%
rename from trunk/include/asm-arm/plat-s3c/regs-iic.h
rename to trunk/arch/arm/plat-s3c/include/plat/regs-iic.h
diff --git a/trunk/drivers/i2c/busses/i2c-s3c2410.c b/trunk/drivers/i2c/busses/i2c-s3c2410.c
index c772e02c2803..4ad9c47ee4fd 100644
--- a/trunk/drivers/i2c/busses/i2c-s3c2410.c
+++ b/trunk/drivers/i2c/busses/i2c-s3c2410.c
@@ -40,8 +40,8 @@
 #include <asm/io.h>
 
 #include <mach/regs-gpio.h>
-#include <asm/plat-s3c/regs-iic.h>
-#include <asm/plat-s3c/iic.h>
+#include <plat/regs-iic.h>
+#include <plat/iic.h>
 
 /* i2c controller state */