diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
| commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
| tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /arch/blackfin/kernel/entry.S | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
| parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/blackfin/kernel/entry.S')
| -rw-r--r-- | arch/blackfin/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S index 31bd9bf3efa..faea88ebb2e 100644 --- a/arch/blackfin/kernel/entry.S +++ b/arch/blackfin/kernel/entry.S @@ -32,7 +32,7 @@ #include <asm/errno.h> #include <asm/asm-offsets.h> -#include <asm/mach-common/context.S> +#include <asm/context.S> #ifdef CONFIG_EXCPT_IRQ_SYSC_L1 .section .l1.text |