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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
entry.S
diff --git
a/arch/x86_64/kernel/entry.S
b/arch/x86_64/kernel/entry.S
index
be51dbe
..
3620508
100644
(file)
--- a/
arch/x86_64/kernel/entry.S
+++ b/
arch/x86_64/kernel/entry.S
@@
-36,7
+36,7
@@
#include <asm/errno.h>
#include <asm/dwarf2.h>
#include <asm/calling.h>
-#include <asm/
offset
.h>
+#include <asm/
asm-offsets
.h>
#include <asm/msr.h>
#include <asm/unistd.h>
#include <asm/thread_info.h>