---

yaml --- r: 66167 b: refs/heads/master c: 2f56cfd h: refs/heads/master i: 66165: 62a5209 66163: 939369e 66159: 7e0c5fe v: v3
git-mirror · Oct 11, 2007 · a611fcd · a611fcd
1 parent 00ad931
commit a611fcd
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df78b5c8faa72b3c04f82faab126de93af178348
+refs/heads/master: 2f56cfdd812a17623483d3dfa3370a2e6282b245
diff --git a/trunk/arch/mips/Makefile b/trunk/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/trunk/arch/mips/arc/Makefile → trunk/arch/mips/fw/arc/Makefile b/trunk/arch/mips/arc/Makefile → trunk/arch/mips/fw/arc/Makefile
diff --git a/trunk/arch/mips/arc/arc_con.c → trunk/arch/mips/fw/arc/arc_con.c b/trunk/arch/mips/arc/arc_con.c → trunk/arch/mips/fw/arc/arc_con.c
diff --git a/trunk/arch/mips/arc/cmdline.c → trunk/arch/mips/fw/arc/cmdline.c b/trunk/arch/mips/arc/cmdline.c → trunk/arch/mips/fw/arc/cmdline.c
diff --git a/trunk/arch/mips/arc/env.c → trunk/arch/mips/fw/arc/env.c b/trunk/arch/mips/arc/env.c → trunk/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/trunk/arch/mips/arc/file.c → trunk/arch/mips/fw/arc/file.c b/trunk/arch/mips/arc/file.c → trunk/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/trunk/arch/mips/arc/identify.c → trunk/arch/mips/fw/arc/identify.c b/trunk/arch/mips/arc/identify.c → trunk/arch/mips/fw/arc/identify.c
diff --git a/trunk/arch/mips/arc/init.c → trunk/arch/mips/fw/arc/init.c b/trunk/arch/mips/arc/init.c → trunk/arch/mips/fw/arc/init.c
diff --git a/trunk/arch/mips/arc/memory.c → trunk/arch/mips/fw/arc/memory.c b/trunk/arch/mips/arc/memory.c → trunk/arch/mips/fw/arc/memory.c
diff --git a/trunk/arch/mips/arc/misc.c → trunk/arch/mips/fw/arc/misc.c b/trunk/arch/mips/arc/misc.c → trunk/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/trunk/arch/mips/arc/promlib.c → trunk/arch/mips/fw/arc/promlib.c b/trunk/arch/mips/arc/promlib.c → trunk/arch/mips/fw/arc/promlib.c
diff --git a/trunk/arch/mips/arc/salone.c → trunk/arch/mips/fw/arc/salone.c b/trunk/arch/mips/arc/salone.c → trunk/arch/mips/fw/arc/salone.c
diff --git a/trunk/arch/mips/arc/time.c → trunk/arch/mips/fw/arc/time.c b/trunk/arch/mips/arc/time.c → trunk/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/trunk/arch/mips/arc/tree.c → trunk/arch/mips/fw/arc/tree.c b/trunk/arch/mips/arc/tree.c → trunk/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/trunk/arch/mips/sni/setup.c b/trunk/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/trunk/include/asm-mips/arc/hinv.h → trunk/include/asm-mips/fw/arc/hinv.h b/trunk/include/asm-mips/arc/hinv.h → trunk/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/trunk/include/asm-mips/arc/types.h → trunk/include/asm-mips/fw/arc/types.h b/trunk/include/asm-mips/arc/types.h → trunk/include/asm-mips/fw/arc/types.h
diff --git a/trunk/include/asm-mips/sgiarcs.h b/trunk/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/trunk/include/asm-mips/sn/klconfig.h b/trunk/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>