diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /arch/xtensa/kernel/vectors.S | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/xtensa/kernel/vectors.S')
| -rw-r--r-- | arch/xtensa/kernel/vectors.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S index 74a7518faf16..70066e3582d0 100644 --- a/arch/xtensa/kernel/vectors.S +++ b/arch/xtensa/kernel/vectors.S | |||
| @@ -44,14 +44,12 @@ | |||
| 44 | 44 | ||
| 45 | #include <linux/linkage.h> | 45 | #include <linux/linkage.h> |
| 46 | #include <asm/ptrace.h> | 46 | #include <asm/ptrace.h> |
| 47 | #include <asm/ptrace.h> | ||
| 48 | #include <asm/current.h> | 47 | #include <asm/current.h> |
| 49 | #include <asm/asm-offsets.h> | 48 | #include <asm/asm-offsets.h> |
| 50 | #include <asm/pgtable.h> | 49 | #include <asm/pgtable.h> |
| 51 | #include <asm/processor.h> | 50 | #include <asm/processor.h> |
| 52 | #include <asm/page.h> | 51 | #include <asm/page.h> |
| 53 | #include <asm/thread_info.h> | 52 | #include <asm/thread_info.h> |
| 54 | #include <asm/processor.h> | ||
| 55 | 53 | ||
| 56 | #define WINDOW_VECTORS_SIZE 0x180 | 54 | #define WINDOW_VECTORS_SIZE 0x180 |
| 57 | 55 | ||