diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:45:04 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:45:04 -0400 |
| commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
| tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /arch/xtensa/kernel/vectors.S | |
| parent | 877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/xtensa/kernel/vectors.S')
| -rw-r--r-- | arch/xtensa/kernel/vectors.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S index 81808f0c6742..0e74397bfa2b 100644 --- a/arch/xtensa/kernel/vectors.S +++ b/arch/xtensa/kernel/vectors.S | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <asm/ptrace.h> | 46 | #include <asm/ptrace.h> |
| 47 | #include <asm/ptrace.h> | 47 | #include <asm/ptrace.h> |
| 48 | #include <asm/current.h> | 48 | #include <asm/current.h> |
| 49 | #include <asm/offsets.h> | 49 | #include <asm/asm-offsets.h> |
| 50 | #include <asm/pgtable.h> | 50 | #include <asm/pgtable.h> |
| 51 | #include <asm/processor.h> | 51 | #include <asm/processor.h> |
| 52 | #include <asm/page.h> | 52 | #include <asm/page.h> |