diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /arch/cris/arch-v32/kernel/entry.S | |
| parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
| parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
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 eebbaba4543..7f6f93e6b70 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S @@ -24,8 +24,8 @@ #include <asm/thread_info.h> #include <asm/asm-offsets.h> -#include <asm/arch/hwregs/asm/reg_map_asm.h> -#include <asm/arch/hwregs/asm/intr_vect_defs_asm.h> +#include <hwregs/asm/reg_map_asm.h> +#include <hwregs/asm/intr_vect_defs_asm.h> ;; Exported functions. .globl system_call |