diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:20:53 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:20:53 +0200 |
commit | 388f8e127337aa55037195fc4c4528fc5f69ff2d (patch) | |
tree | 4c8af2f385143ecda7c4b6ec01b33536f5b2a068 /include/acpi/acpi_numa.h | |
parent | futex: Allow for compiling out PI support (diff) | |
parent | Merge tag 'pinctrl-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
download | linux-388f8e127337aa55037195fc4c4528fc5f69ff2d.tar.xz linux-388f8e127337aa55037195fc4c4528fc5f69ff2d.zip |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/acpi/acpi_numa.h')
-rw-r--r-- | include/acpi/acpi_numa.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index d4b72944ccda..1e3a74f94131 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h @@ -3,6 +3,7 @@ #ifdef CONFIG_ACPI_NUMA #include <linux/kernel.h> +#include <linux/numa.h> /* Proximity bitmap length */ #if MAX_NUMNODES > 256 |