diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:49:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:49:42 -0700 |
| commit | 66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f (patch) | |
| tree | 98967791a802b95d37bc4035d7bdd27cf260097e /arch/xtensa/kernel/asm-offsets.c | |
| parent | 6e57559022a2c6e3decfb77a228f8a354ac23ba1 (diff) | |
| parent | 66630f71e23a3b5fe778d38aea2f0c6d017602bf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Disable PCI and nfsroot on simulation target
xtensa: Add missing include in coprocessor.h
xtensa: Fix the network driver for the simulator target
xtensa: Shuffle include statements to fix linker script
xtensa: Add -mforce-no-pic option is supported
xtensa: Fixes due to bss boundary symbol name changes.
xtensa: Fix linker script patch-up
xtensa: Fix FLUSH_DCACHE macro for some variants.
Diffstat (limited to 'arch/xtensa/kernel/asm-offsets.c')
| -rw-r--r-- | arch/xtensa/kernel/asm-offsets.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c index 070ff8af3a21..7dc3f9157185 100644 --- a/arch/xtensa/kernel/asm-offsets.c +++ b/arch/xtensa/kernel/asm-offsets.c @@ -13,6 +13,7 @@ */ #include <asm/processor.h> +#include <asm/coprocessor.h> #include <linux/types.h> #include <linux/stddef.h> |