diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2020-01-10 18:53:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2020-01-10 18:53:14 +0100 |
| commit | 57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e (patch) | |
| tree | eaa43171e82737e8b33239e2e9bc3b4de67b7ddd /arch/x86/include/asm/pci.h | |
| parent | Merge branch 'linus' into efi/core, to pick up fixes (diff) | |
| parent | mm, x86/mm: Untangle address space layout definitions from basic pgtable type... (diff) | |
| download | linux-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.tar.gz linux-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.tar.bz2 linux-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.zip | |
Merge branch 'x86/mm' into efi/core, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/pci.h')
| -rw-r--r-- | arch/x86/include/asm/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 90d0731fdcb6..c1fdd43fe187 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -9,7 +9,7 @@ #include <linux/scatterlist.h> #include <linux/numa.h> #include <asm/io.h> -#include <asm/pat.h> +#include <asm/memtype.h> #include <asm/x86_init.h> struct pci_sysdata { |