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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
trampoline_64.S
diff --git
a/arch/x86/kernel/trampoline_64.S
b/arch/x86/kernel/trampoline_64.S
index
3af2dff
..
075d130
100644
(file)
--- a/
arch/x86/kernel/trampoline_64.S
+++ b/
arch/x86/kernel/trampoline_64.S
@@
-127,7
+127,7
@@
startup_64:
no_longmode:
hlt
jmp no_longmode
-#include "verify_cpu
_64
.S"
+#include "verify_cpu.S"
# Careful these need to be in the same 64K segment as the above;
tidt: