diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-01-28 09:21:24 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 06:53:19 -0500 |
commit | 3482d713a91befb8c96722cb8d55aed36c212d9e (patch) | |
tree | e5b8f0e779fb64e9952765694ceaaf572aa6a0fa /arch/mips | |
parent | fcf6735e9cf08343bef9ff43205d91ef102af52f (diff) |
MIPS: Move arch/mips/mm/uasm.h to arch/mips/include/asm/uasm.h
Signed-off-by: Florian Fainelli <florian@openwrt.org>
To: linux-mips@linux-mips.org
To: David Daney <ddaney@caviumnetworks.com>
Patchwork: http://patchwork.linux-mips.org/patch/887/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/include/asm/uasm.h (renamed from arch/mips/mm/uasm.h) | 0 | ||||
-rw-r--r-- | arch/mips/mm/page.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/tlbex.c | 3 | ||||
-rw-r--r-- | arch/mips/mm/uasm.c | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/arch/mips/mm/uasm.h b/arch/mips/include/asm/uasm.h index 3d153edaa51e..3d153edaa51e 100644 --- a/arch/mips/mm/uasm.h +++ b/arch/mips/include/asm/uasm.h | |||
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c index f5c73754d664..36272f7d3744 100644 --- a/arch/mips/mm/page.c +++ b/arch/mips/mm/page.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <asm/sibyte/sb1250_dma.h> | 35 | #include <asm/sibyte/sb1250_dma.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #include "uasm.h" | 38 | #include <asm/uasm.h> |
39 | 39 | ||
40 | /* Registers used in the assembled routines. */ | 40 | /* Registers used in the assembled routines. */ |
41 | #define ZERO 0 | 41 | #define ZERO 0 |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index eae45f0f9a16..bcf30026d1f6 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -29,8 +29,7 @@ | |||
29 | 29 | ||
30 | #include <asm/mmu_context.h> | 30 | #include <asm/mmu_context.h> |
31 | #include <asm/war.h> | 31 | #include <asm/war.h> |
32 | 32 | #include <asm/uasm.h> | |
33 | #include "uasm.h" | ||
34 | 33 | ||
35 | static inline int r45k_bvahwbug(void) | 34 | static inline int r45k_bvahwbug(void) |
36 | { | 35 | { |
diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c index 0a165c5179a1..e3ca0f7ed01a 100644 --- a/arch/mips/mm/uasm.c +++ b/arch/mips/mm/uasm.c | |||
@@ -19,8 +19,7 @@ | |||
19 | #include <asm/inst.h> | 19 | #include <asm/inst.h> |
20 | #include <asm/elf.h> | 20 | #include <asm/elf.h> |
21 | #include <asm/bugs.h> | 21 | #include <asm/bugs.h> |
22 | 22 | #include <asm/uasm.h> | |
23 | #include "uasm.h" | ||
24 | 23 | ||
25 | enum fields { | 24 | enum fields { |
26 | RS = 0x001, | 25 | RS = 0x001, |