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
Automatic merge of /spare/repo/netdev-2.6 branch r8169
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
io_apic.c
diff --git
a/arch/x86_64/kernel/io_apic.c
b/arch/x86_64/kernel/io_apic.c
index
80e9b49
..
afd87e6
100644
(file)
--- a/
arch/x86_64/kernel/io_apic.c
+++ b/
arch/x86_64/kernel/io_apic.c
@@
-37,6
+37,7
@@
#include <asm/desc.h>
#include <asm/proto.h>
#include <asm/mach_apic.h>
+#include <asm/acpi.h>
#define __apicdebuginit __init