From 2f56cfdd812a17623483d3dfa3370a2e6282b245 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 5 Sep 2007 08:59:34 +0200 Subject: [PATCH] [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 Signed-off-by: Ralf Baechle --- arch/mips/Makefile | 2 +- arch/mips/{ => fw}/arc/Makefile | 0 arch/mips/{ => fw}/arc/arc_con.c | 0 arch/mips/{ => fw}/arc/cmdline.c | 0 arch/mips/{ => fw}/arc/env.c | 2 +- arch/mips/{ => fw}/arc/file.c | 2 +- arch/mips/{ => fw}/arc/identify.c | 0 arch/mips/{ => fw}/arc/init.c | 0 arch/mips/{ => fw}/arc/memory.c | 0 arch/mips/{ => fw}/arc/misc.c | 2 +- arch/mips/{ => fw}/arc/promlib.c | 0 arch/mips/{ => fw}/arc/salone.c | 0 arch/mips/{ => fw}/arc/time.c | 2 +- arch/mips/{ => fw}/arc/tree.c | 2 +- arch/mips/sni/setup.c | 2 +- include/asm-mips/{ => fw}/arc/hinv.h | 2 +- include/asm-mips/{ => fw}/arc/types.h | 0 include/asm-mips/sgiarcs.h | 2 +- include/asm-mips/sn/klconfig.h | 4 ++-- 19 files changed, 11 insertions(+), 11 deletions(-) rename arch/mips/{ => fw}/arc/Makefile (100%) rename arch/mips/{ => fw}/arc/arc_con.c (100%) rename arch/mips/{ => fw}/arc/cmdline.c (100%) rename arch/mips/{ => fw}/arc/env.c (95%) rename arch/mips/{ => fw}/arc/file.c (98%) rename arch/mips/{ => fw}/arc/identify.c (100%) rename arch/mips/{ => fw}/arc/init.c (100%) rename arch/mips/{ => fw}/arc/memory.c (100%) rename arch/mips/{ => fw}/arc/misc.c (97%) rename arch/mips/{ => fw}/arc/promlib.c (100%) rename arch/mips/{ => fw}/arc/salone.c (100%) rename arch/mips/{ => fw}/arc/time.c (94%) rename arch/mips/{ => fw}/arc/tree.c (99%) rename include/asm-mips/{ => fw}/arc/hinv.h (99%) rename include/asm-mips/{ => fw}/arc/types.h (100%) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index a097ae61eb6..b0fac2d436b 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 e521a6e010a..6f5dd42b96e 100644 --- a/arch/mips/arc/env.c +++ b/arch/mips/fw/arc/env.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include 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 cb0127cf5bc..30335341b44 100644 --- a/arch/mips/arc/file.c +++ b/arch/mips/fw/arc/file.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include 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 b2e10b9e945..e527c5fd5a3 100644 --- a/arch/mips/arc/misc.c +++ b/arch/mips/fw/arc/misc.c @@ -14,7 +14,7 @@ #include -#include +#include #include #include #include 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 299ff2c5c0b..42138c837d4 100644 --- a/arch/mips/arc/time.c +++ b/arch/mips/fw/arc/time.c @@ -9,7 +9,7 @@ */ #include -#include +#include #include 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 abd1786ea09..d68e5a59c1f 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 -#include +#include #include #undef DEBUG_PROM_TREE diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 6edbb3051c8..883e35ea4e8 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c @@ -15,7 +15,7 @@ #include #ifdef CONFIG_ARC -#include +#include #include #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 1862912ab14..e6ff4add04e 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 -#include +#include /* 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 439bce7daa3..6d1eda60e01 100644 --- a/include/asm-mips/sgiarcs.h +++ b/include/asm-mips/sgiarcs.h @@ -13,7 +13,7 @@ #define _ASM_SGIARCS_H #include -#include +#include /* 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 82aeb9e322d..852213d03b7 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 -#include -#include +#include +#include #if defined(CONFIG_SGI_IP35) // The hack file has to be before vector and after sn0_fru.... #include -- 2.20.1