diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 21:28:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 21:28:33 +0200 |
| commit | c0a4f5b354dc26573cfaa541064fd35a794eb166 (patch) | |
| tree | 4b1eddb1eb006d6f905e51519ef51b6a3949c274 /arch | |
| parent | Merge tag 'pm-5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff) | |
| parent | Fix build error when CONFIG_ACPI is not set/enabled: (diff) | |
| download | linux-c0a4f5b354dc26573cfaa541064fd35a794eb166.tar.xz linux-c0a4f5b354dc26573cfaa541064fd35a794eb166.zip | |
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.c | 1 |
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) |