From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 5 Sep 2007 06:59:34 +0000 (+0200)
Subject: [MIPS] Move ARC code into arch/mips/fw/arc
X-Git-Tag: v2.6.24-rc1~1455^2~48
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f56cfdd812a17623483d3dfa3370a2e6282b245;p=linux-2.6

[MIPS] Move ARC code into arch/mips/fw/arc

Move the ARC code to arch/mips/fw/arc from arch/mips/arc.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index a097ae61eb..b0fac2d436 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -148,7 +148,7 @@ endif
 #
 # Firmware support
 #
-libs-$(CONFIG_ARC)		+= arch/mips/arc/
+libs-$(CONFIG_ARC)		+= arch/mips/fw/arc/
 libs-$(CONFIG_CFE)		+= arch/mips/fw/cfe/
 libs-$(CONFIG_SIBYTE_CFE)	+= arch/mips/sibyte/cfe/
 
diff --git a/arch/mips/arc/Makefile b/arch/mips/fw/arc/Makefile
similarity index 100%
rename from arch/mips/arc/Makefile
rename to arch/mips/fw/arc/Makefile
diff --git a/arch/mips/arc/arc_con.c b/arch/mips/fw/arc/arc_con.c
similarity index 100%
rename from arch/mips/arc/arc_con.c
rename to arch/mips/fw/arc/arc_con.c
diff --git a/arch/mips/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c
similarity index 100%
rename from arch/mips/arc/cmdline.c
rename to arch/mips/fw/arc/cmdline.c
diff --git a/arch/mips/arc/env.c b/arch/mips/fw/arc/env.c
similarity index 95%
rename from arch/mips/arc/env.c
rename to arch/mips/fw/arc/env.c
index e521a6e010..6f5dd42b96 100644
--- a/arch/mips/arc/env.c
+++ b/arch/mips/fw/arc/env.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 PCHAR __init
diff --git a/arch/mips/arc/file.c b/arch/mips/fw/arc/file.c
similarity index 98%
rename from arch/mips/arc/file.c
rename to arch/mips/fw/arc/file.c
index cb0127cf5b..30335341b4 100644
--- a/arch/mips/arc/file.c
+++ b/arch/mips/fw/arc/file.c
@@ -10,7 +10,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 LONG
diff --git a/arch/mips/arc/identify.c b/arch/mips/fw/arc/identify.c
similarity index 100%
rename from arch/mips/arc/identify.c
rename to arch/mips/fw/arc/identify.c
diff --git a/arch/mips/arc/init.c b/arch/mips/fw/arc/init.c
similarity index 100%
rename from arch/mips/arc/init.c
rename to arch/mips/fw/arc/init.c
diff --git a/arch/mips/arc/memory.c b/arch/mips/fw/arc/memory.c
similarity index 100%
rename from arch/mips/arc/memory.c
rename to arch/mips/fw/arc/memory.c
diff --git a/arch/mips/arc/misc.c b/arch/mips/fw/arc/misc.c
similarity index 97%
rename from arch/mips/arc/misc.c
rename to arch/mips/fw/arc/misc.c
index b2e10b9e94..e527c5fd5a 100644
--- a/arch/mips/arc/misc.c
+++ b/arch/mips/fw/arc/misc.c
@@ -14,7 +14,7 @@
 
 #include <asm/bcache.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 #include <asm/bootinfo.h>
 #include <asm/system.h>
diff --git a/arch/mips/arc/promlib.c b/arch/mips/fw/arc/promlib.c
similarity index 100%
rename from arch/mips/arc/promlib.c
rename to arch/mips/fw/arc/promlib.c
diff --git a/arch/mips/arc/salone.c b/arch/mips/fw/arc/salone.c
similarity index 100%
rename from arch/mips/arc/salone.c
rename to arch/mips/fw/arc/salone.c
diff --git a/arch/mips/arc/time.c b/arch/mips/fw/arc/time.c
similarity index 94%
rename from arch/mips/arc/time.c
rename to arch/mips/fw/arc/time.c
index 299ff2c5c0..42138c837d 100644
--- a/arch/mips/arc/time.c
+++ b/arch/mips/fw/arc/time.c
@@ -9,7 +9,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 struct linux_tinfo * __init
diff --git a/arch/mips/arc/tree.c b/arch/mips/fw/arc/tree.c
similarity index 99%
rename from arch/mips/arc/tree.c
rename to arch/mips/fw/arc/tree.c
index abd1786ea0..d68e5a59c1 100644
--- a/arch/mips/arc/tree.c
+++ b/arch/mips/fw/arc/tree.c
@@ -10,7 +10,7 @@
  * Copyright (C) 1999 Silicon Graphics, Inc.
  */
 #include <linux/init.h>
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 #undef DEBUG_PROM_TREE
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 6edbb3051c..883e35ea4e 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -15,7 +15,7 @@
 #include <linux/screen_info.h>
 
 #ifdef CONFIG_ARC
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 #endif
 
diff --git a/include/asm-mips/arc/hinv.h b/include/asm-mips/fw/arc/hinv.h
similarity index 99%
rename from include/asm-mips/arc/hinv.h
rename to include/asm-mips/fw/arc/hinv.h
index 1862912ab1..e6ff4add04 100644
--- a/include/asm-mips/arc/hinv.h
+++ b/include/asm-mips/fw/arc/hinv.h
@@ -5,7 +5,7 @@
 #define _ASM_ARC_HINV_H
 
 #include <asm/sgidefs.h>
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 
 /* configuration query defines */
 typedef enum configclass {
diff --git a/include/asm-mips/arc/types.h b/include/asm-mips/fw/arc/types.h
similarity index 100%
rename from include/asm-mips/arc/types.h
rename to include/asm-mips/fw/arc/types.h
diff --git a/include/asm-mips/sgiarcs.h b/include/asm-mips/sgiarcs.h
index 439bce7daa..6d1eda60e0 100644
--- a/include/asm-mips/sgiarcs.h
+++ b/include/asm-mips/sgiarcs.h
@@ -13,7 +13,7 @@
 #define _ASM_SGIARCS_H
 
 #include <asm/types.h>
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 
 /* Various ARCS error codes. */
 #define PROM_ESUCCESS                   0x00
diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h
index 82aeb9e322..852213d03b 100644
--- a/include/asm-mips/sn/klconfig.h
+++ b/include/asm-mips/sn/klconfig.h
@@ -51,8 +51,8 @@
 
 #if defined(CONFIG_SGI_IP27) || defined(CONFIG_SGI_IP35)
 #include <asm/sn/agent.h>
-#include <asm/arc/types.h>
-#include <asm/arc/hinv.h>
+#include <asm/fw/arc/types.h>
+#include <asm/fw/arc/hinv.h>
 #if defined(CONFIG_SGI_IP35)
 // The hack file has to be before vector and after sn0_fru....
 #include <asm/hack.h>