diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/cris/arch-v32/kernel/entry.S | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/cris/arch-v32/kernel/entry.S')
| -rw-r--r-- | arch/cris/arch-v32/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index eebbaba45430..7f6f93e6b70e 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S | |||
| @@ -24,8 +24,8 @@ | |||
| 24 | #include <asm/thread_info.h> | 24 | #include <asm/thread_info.h> |
| 25 | #include <asm/asm-offsets.h> | 25 | #include <asm/asm-offsets.h> |
| 26 | 26 | ||
| 27 | #include <asm/arch/hwregs/asm/reg_map_asm.h> | 27 | #include <hwregs/asm/reg_map_asm.h> |
| 28 | #include <asm/arch/hwregs/asm/intr_vect_defs_asm.h> | 28 | #include <hwregs/asm/intr_vect_defs_asm.h> |
| 29 | 29 | ||
| 30 | ;; Exported functions. | 30 | ;; Exported functions. |
| 31 | .globl system_call | 31 | .globl system_call |