diff options
| -rw-r--r-- | arch/mips/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/fw/arc/Makefile (renamed from arch/mips/arc/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/arc_con.c (renamed from arch/mips/arc/arc_con.c) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/cmdline.c (renamed from arch/mips/arc/cmdline.c) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/env.c (renamed from arch/mips/arc/env.c) | 2 | ||||
| -rw-r--r-- | arch/mips/fw/arc/file.c (renamed from arch/mips/arc/file.c) | 2 | ||||
| -rw-r--r-- | arch/mips/fw/arc/identify.c (renamed from arch/mips/arc/identify.c) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/init.c (renamed from arch/mips/arc/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/memory.c (renamed from arch/mips/arc/memory.c) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/misc.c (renamed from arch/mips/arc/misc.c) | 2 | ||||
| -rw-r--r-- | arch/mips/fw/arc/promlib.c (renamed from arch/mips/arc/promlib.c) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/salone.c (renamed from arch/mips/arc/salone.c) | 0 | ||||
| -rw-r--r-- | arch/mips/fw/arc/time.c (renamed from arch/mips/arc/time.c) | 2 | ||||
| -rw-r--r-- | arch/mips/fw/arc/tree.c (renamed from arch/mips/arc/tree.c) | 2 | ||||
| -rw-r--r-- | arch/mips/sni/setup.c | 2 | ||||
| -rw-r--r-- | include/asm-mips/fw/arc/hinv.h (renamed from include/asm-mips/arc/hinv.h) | 2 | ||||
| -rw-r--r-- | include/asm-mips/fw/arc/types.h (renamed from include/asm-mips/arc/types.h) | 0 | ||||
| -rw-r--r-- | include/asm-mips/sgiarcs.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/sn/klconfig.h | 4 |
19 files changed, 11 insertions, 11 deletions
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 index 4f349ec1ea2..4f349ec1ea2 100644 --- a/arch/mips/arc/Makefile +++ b/arch/mips/fw/arc/Makefile diff --git a/arch/mips/arc/arc_con.c b/arch/mips/fw/arc/arc_con.c index bc32fe64f42..bc32fe64f42 100644 --- a/arch/mips/arc/arc_con.c +++ b/arch/mips/fw/arc/arc_con.c diff --git a/arch/mips/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c index fd604ef2882..fd604ef2882 100644 --- a/arch/mips/arc/cmdline.c +++ b/arch/mips/fw/arc/cmdline.c diff --git a/arch/mips/arc/env.c b/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 <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 index cb0127cf5bc..30335341b44 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 index 4b907369b0f..4b907369b0f 100644 --- a/arch/mips/arc/identify.c +++ b/arch/mips/fw/arc/identify.c diff --git a/arch/mips/arc/init.c b/arch/mips/fw/arc/init.c index e2f75b13312..e2f75b13312 100644 --- a/arch/mips/arc/init.c +++ b/arch/mips/fw/arc/init.c diff --git a/arch/mips/arc/memory.c b/arch/mips/fw/arc/memory.c index 83d15791ef6..83d15791ef6 100644 --- a/arch/mips/arc/memory.c +++ b/arch/mips/fw/arc/memory.c diff --git a/arch/mips/arc/misc.c b/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 <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 index c508c00dbb6..c508c00dbb6 100644 --- a/arch/mips/arc/promlib.c +++ b/arch/mips/fw/arc/promlib.c diff --git a/arch/mips/arc/salone.c b/arch/mips/fw/arc/salone.c index e6afb64723d..e6afb64723d 100644 --- a/arch/mips/arc/salone.c +++ b/arch/mips/fw/arc/salone.c diff --git a/arch/mips/arc/time.c b/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 <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 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 <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 6edbb3051c8..883e35ea4e8 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 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 <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 index b9adcd6f086..b9adcd6f086 100644 --- a/include/asm-mips/arc/types.h +++ b/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 <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 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 <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> |