git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
acpi
/
wakeup_64.S
diff --git
a/arch/x86/kernel/acpi/wakeup_64.S
b/arch/x86/kernel/acpi/wakeup_64.S
index 96258d9dc9743c094e0d42af3ff6201d960a6abb..8ea5164cbd0451a27b9048699f60c2420057edb3 100644
(file)
--- a/
arch/x86/kernel/acpi/wakeup_64.S
+++ b/
arch/x86/kernel/acpi/wakeup_64.S
@@
-1,8
+1,8
@@
.text
#include <linux/linkage.h>
#include <asm/segment.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
+#include <asm/pgtable
_types
.h>
+#include <asm/page
_types
.h>
#include <asm/msr.h>
#include <asm/asm-offsets.h>