diff options
| author | Chris Zankel <czankel@speedy.(none)> | 2010-08-03 03:38:00 -0400 |
|---|---|---|
| committer | Chris Zankel <czankel@speedy.(none)> | 2010-08-03 03:38:00 -0400 |
| commit | 66630f71e23a3b5fe778d38aea2f0c6d017602bf (patch) | |
| tree | 4aa52e15d68ce870fc8e7dbc140eeb16cd99ef79 /arch/xtensa/kernel/entry.S | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
| parent | ecd53497b706b235a10c70d4fc639768d7235c5f (diff) | |
Merge remote branch 'origin/master'
Diffstat (limited to 'arch/xtensa/kernel/entry.S')
| -rw-r--r-- | arch/xtensa/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index 77fc9f6dc016..5fd01f6aaf37 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
| 17 | #include <asm/asm-offsets.h> | 17 | #include <asm/asm-offsets.h> |
| 18 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
| 19 | #include <asm/coprocessor.h> | ||
| 19 | #include <asm/thread_info.h> | 20 | #include <asm/thread_info.h> |
| 20 | #include <asm/uaccess.h> | 21 | #include <asm/uaccess.h> |
| 21 | #include <asm/unistd.h> | 22 | #include <asm/unistd.h> |