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
x86, realmode: Move ACPI wakeup to unified realmode code
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
acpi
/
sleep.h
diff --git
a/arch/x86/kernel/acpi/sleep.h
b/arch/x86/kernel/acpi/sleep.h
index d68677a2a01037a758496ee31aa575ccbb2badff..5653a5791ec92291844a55665cc50a0cb402095b 100644
(file)
--- a/
arch/x86/kernel/acpi/sleep.h
+++ b/
arch/x86/kernel/acpi/sleep.h
@@
-2,8
+2,8
@@
* Variables and functions used by the code in sleep.c
*/
-#include <asm/trampoline.h>
#include <linux/linkage.h>
+#include <asm/realmode.h>
extern unsigned long saved_video_mode;
extern long saved_magic;