diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 23:50:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 23:50:58 +0200 |
| commit | feea468014f0c2f930b149e83a9047da86b26e4e (patch) | |
| tree | 29807205f471d63affd20e1e36fc3f832b55a106 /include/acpi | |
| parent | MAINTAINERS: add entry for mediatek usb3 DRD IP driver (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | linux-feea468014f0c2f930b149e83a9047da86b26e4e.tar.xz linux-feea468014f0c2f930b149e83a9047da86b26e4e.zip | |
Merge 4.13-rc5 into usb-next
This gets the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/acpi')
| -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 |