diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:49:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:49:31 +0200 |
| commit | 4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc (patch) | |
| tree | 783b640be1166813cab736e7cabbb9e48acb876d /arch/x86/pci/mmconfig_64.c | |
| parent | 5af218439f3a4c9ca7139a40e5d047fe1ea39551 (diff) | |
| parent | 687d77a5f7b2aae4ea0507888648823f7c24e974 (diff) | |
| download | linux-4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc.tar.gz | |
Merge branch 'WIP.x86/boot' into x86/boot, to pick up ready branch
The E820 rework in WIP.x86/boot has gone through a couple of weeks of exposure in -tip, merge it in a wider fashion. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/pci/mmconfig_64.c')
| -rw-r--r-- | arch/x86/pci/mmconfig_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c index bea52496aea6..f1c1aa0430ae 100644 --- a/arch/x86/pci/mmconfig_64.c +++ b/arch/x86/pci/mmconfig_64.c @@ -10,7 +10,7 @@ #include <linux/acpi.h> #include <linux/bitmap.h> #include <linux/rcupdate.h> -#include <asm/e820.h> +#include <asm/e820/api.h> #include <asm/pci_x86.h> #define PREFIX "PCI: " |