projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
[linux-2.6-block.git]
/
arch
/
blackfin
/
mach-common
/
entry.S
diff --git
a/arch/blackfin/mach-common/entry.S
b/arch/blackfin/mach-common/entry.S
index 117c01c2c6b0847eb8beb5631f7563d2de2663dd..847c172a99ebcd9a31c0940718077fe6556dbe92 100644
(file)
--- a/
arch/blackfin/mach-common/entry.S
+++ b/
arch/blackfin/mach-common/entry.S
@@
-43,7
+43,7
@@
#include <asm/asm-offsets.h>
#include <asm/trace.h>
-#include <asm/
mach-common/
context.S>
+#include <asm/context.S>
#if defined(CONFIG_BFIN_SCRATCH_REG_RETN)
# define EX_SCRATCH_REG RETN