diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /arch/blackfin/mach-common/entry.S | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'arch/blackfin/mach-common/entry.S')
| -rw-r--r-- | arch/blackfin/mach-common/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 117c01c2c6b0..847c172a99eb 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <asm/asm-offsets.h> | 43 | #include <asm/asm-offsets.h> |
| 44 | #include <asm/trace.h> | 44 | #include <asm/trace.h> |
| 45 | 45 | ||
| 46 | #include <asm/mach-common/context.S> | 46 | #include <asm/context.S> |
| 47 | 47 | ||
| 48 | #if defined(CONFIG_BFIN_SCRATCH_REG_RETN) | 48 | #if defined(CONFIG_BFIN_SCRATCH_REG_RETN) |
| 49 | # define EX_SCRATCH_REG RETN | 49 | # define EX_SCRATCH_REG RETN |