git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.29-rc8' into cpus4096
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
apm_32.c
diff --git
a/arch/x86/kernel/apm_32.c
b/arch/x86/kernel/apm_32.c
index
266ec6c
..
10033fe
100644
(file)
--- a/
arch/x86/kernel/apm_32.c
+++ b/
arch/x86/kernel/apm_32.c
@@
-301,7
+301,7
@@
extern int (*console_blank_hook)(int);
*/
#define APM_ZERO_SEGS
-#include
"apm.h"
+#include
<asm/apm.h>
/*
* Define to re-initialize the interrupt 0 timer to 100 Hz after a suspend.