projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-block.git]
/
arch
/
x86
/
kernel
/
apic
/
apic_flat_64.c
diff --git
a/arch/x86/kernel/apic/apic_flat_64.c
b/arch/x86/kernel/apic/apic_flat_64.c
index 5d5b9eb2b7a417d692be43ecdda99cfe9e781fa4..2c621a6b901a7642838c5a74a54be4bf3fcbe58a 100644
(file)
--- a/
arch/x86/kernel/apic/apic_flat_64.c
+++ b/
arch/x86/kernel/apic/apic_flat_64.c
@@
-20,9
+20,7
@@
#include <asm/apic.h>
#include <asm/ipi.h>
-#ifdef CONFIG_ACPI
-#include <acpi/acpi_bus.h>
-#endif
+#include <linux/acpi.h>
static struct apic apic_physflat;
static struct apic apic_flat;