diff options
Diffstat (limited to 'arch')
-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 |
15 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index a097ae61eb6b..b0fac2d436b7 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -148,7 +148,7 @@ endif | |||
148 | # | 148 | # |
149 | # Firmware support | 149 | # Firmware support |
150 | # | 150 | # |
151 | libs-$(CONFIG_ARC) += arch/mips/arc/ | 151 | libs-$(CONFIG_ARC) += arch/mips/fw/arc/ |
152 | libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ | 152 | libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ |
153 | libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/ | 153 | libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/ |
154 | 154 | ||
diff --git a/arch/mips/arc/Makefile b/arch/mips/fw/arc/Makefile index 4f349ec1ea2d..4f349ec1ea2d 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 bc32fe64f42a..bc32fe64f42a 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 fd604ef28823..fd604ef28823 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 e521a6e010aa..6f5dd42b96e2 100644 --- a/arch/mips/arc/env.c +++ b/arch/mips/fw/arc/env.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
13 | 13 | ||
14 | #include <asm/arc/types.h> | 14 | #include <asm/fw/arc/types.h> |
15 | #include <asm/sgialib.h> | 15 | #include <asm/sgialib.h> |
16 | 16 | ||
17 | PCHAR __init | 17 | PCHAR __init |
diff --git a/arch/mips/arc/file.c b/arch/mips/fw/arc/file.c index cb0127cf5bc1..30335341b447 100644 --- a/arch/mips/arc/file.c +++ b/arch/mips/fw/arc/file.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | 12 | ||
13 | #include <asm/arc/types.h> | 13 | #include <asm/fw/arc/types.h> |
14 | #include <asm/sgialib.h> | 14 | #include <asm/sgialib.h> |
15 | 15 | ||
16 | LONG | 16 | LONG |
diff --git a/arch/mips/arc/identify.c b/arch/mips/fw/arc/identify.c index 4b907369b0f9..4b907369b0f9 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 e2f75b13312f..e2f75b13312f 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 83d15791ef6a..83d15791ef6a 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 b2e10b9e9452..e527c5fd5a32 100644 --- a/arch/mips/arc/misc.c +++ b/arch/mips/fw/arc/misc.c | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #include <asm/bcache.h> | 15 | #include <asm/bcache.h> |
16 | 16 | ||
17 | #include <asm/arc/types.h> | 17 | #include <asm/fw/arc/types.h> |
18 | #include <asm/sgialib.h> | 18 | #include <asm/sgialib.h> |
19 | #include <asm/bootinfo.h> | 19 | #include <asm/bootinfo.h> |
20 | #include <asm/system.h> | 20 | #include <asm/system.h> |
diff --git a/arch/mips/arc/promlib.c b/arch/mips/fw/arc/promlib.c index c508c00dbb64..c508c00dbb64 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 e6afb64723d0..e6afb64723d0 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 299ff2c5c0b5..42138c837d48 100644 --- a/arch/mips/arc/time.c +++ b/arch/mips/fw/arc/time.c | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | 11 | ||
12 | #include <asm/arc/types.h> | 12 | #include <asm/fw/arc/types.h> |
13 | #include <asm/sgialib.h> | 13 | #include <asm/sgialib.h> |
14 | 14 | ||
15 | struct linux_tinfo * __init | 15 | struct linux_tinfo * __init |
diff --git a/arch/mips/arc/tree.c b/arch/mips/fw/arc/tree.c index abd1786ea09b..d68e5a59c1f6 100644 --- a/arch/mips/arc/tree.c +++ b/arch/mips/fw/arc/tree.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Copyright (C) 1999 Silicon Graphics, Inc. | 10 | * Copyright (C) 1999 Silicon Graphics, Inc. |
11 | */ | 11 | */ |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <asm/arc/types.h> | 13 | #include <asm/fw/arc/types.h> |
14 | #include <asm/sgialib.h> | 14 | #include <asm/sgialib.h> |
15 | 15 | ||
16 | #undef DEBUG_PROM_TREE | 16 | #undef DEBUG_PROM_TREE |
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 6edbb3051c82..883e35ea4e82 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/screen_info.h> | 15 | #include <linux/screen_info.h> |
16 | 16 | ||
17 | #ifdef CONFIG_ARC | 17 | #ifdef CONFIG_ARC |
18 | #include <asm/arc/types.h> | 18 | #include <asm/fw/arc/types.h> |
19 | #include <asm/sgialib.h> | 19 | #include <asm/sgialib.h> |
20 | #endif | 20 | #endif |
21 | 21 | ||