summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-21 12:28:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-21 12:28:33 -0700
commitc0a4f5b354dc26573cfaa541064fd35a794eb166 (patch)
tree4b1eddb1eb006d6f905e51519ef51b6a3949c274 /arch
parent985c788b6da44dc21b401ce8ce3c2db023ef79e4 (diff)
parentee87e1557c42dc9c2da11c38e11b87c311569853 (diff)
Merge tag 'for-linus-5.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross: "One build fix and a minor fix for suppressing a useless warning when booting a Xen dom0 via UEFI" * tag 'for-linus-5.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: Fix build error when CONFIG_ACPI is not set/enabled: efi: avoid error message when booting under Xen
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/xen.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 9f9aad42ccff..89395a5049bb 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -26,6 +26,7 @@
#include <asm/xen/pci.h>
#include <asm/xen/cpuid.h>
#include <asm/apic.h>
+#include <asm/acpi.h>
#include <asm/i8259.h>
static int xen_pcifront_enable_irq(struct pci_dev *dev)