From 9498cb79463c9b2abb243a4b0c2ce3ac1853d5b0 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] [ARM] S3C: Move i2c headers to
 arch/arm/plat-s3c/include/plat.

Move the i2c headers to arch/arm/plat-s3c/include/plat
ready to clean out the old include directories.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
 arch/arm/mach-s3c2410/mach-bast.c                             | 2 +-
 arch/arm/mach-s3c2410/mach-n30.c                              | 2 +-
 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
 drivers/i2c/busses/i2c-s3c2410.c                              | 4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/iic.h (100%)
 rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-iic.h (100%)

diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 8db9c700e3c..8da05f9e7bb 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/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/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index 82505517846..836c9f63921 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/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/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c
index b08f18c8c47..80208d37756 100644
--- a/arch/arm/mach-s3c2412/mach-jive.c
+++ b/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/include/asm-arm/plat-s3c/iic.h b/arch/arm/plat-s3c/include/plat/iic.h
similarity index 100%
rename from include/asm-arm/plat-s3c/iic.h
rename to arch/arm/plat-s3c/include/plat/iic.h
diff --git a/include/asm-arm/plat-s3c/regs-iic.h b/arch/arm/plat-s3c/include/plat/regs-iic.h
similarity index 100%
rename from include/asm-arm/plat-s3c/regs-iic.h
rename to arch/arm/plat-s3c/include/plat/regs-iic.h
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index c772e02c280..4ad9c47ee4f 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/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 */
 
-- 
2.43.2