git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/core' into x86/apic
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
entry-common.S
diff --git
a/arch/arm/kernel/entry-common.S
b/arch/arm/kernel/entry-common.S
index
84694e8
..
060d7e2
100644
(file)
--- a/
arch/arm/kernel/entry-common.S
+++ b/
arch/arm/kernel/entry-common.S
@@
-10,7
+10,7
@@
#include <asm/unistd.h>
#include <asm/ftrace.h>
-#include <
asm/ar
ch/entry-macro.S>
+#include <
ma
ch/entry-macro.S>
#include "entry-header.S"