diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:13:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:13:29 +0100 |
| commit | 3f66c315f5929d0ad19d8e9d29c8001543aa9be2 (patch) | |
| tree | 61a61a3d6558963d1dc6583e3ea67632560cf9c0 /arch/x86/include/asm | |
| parent | 5c2aae8355f7ec1341d5c473c500a77bbfa7f701 (diff) | |
| parent | bee7f9c83e1d18af6fee06b97b6558cbd1cded45 (diff) | |
Merge branch 'acpi-tables'
* acpi-tables:
ACPI / x86: Increase override tables number limit
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index b1977bad543..c8c1e700c26 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -26,6 +26,7 @@ #include <acpi/pdc_intel.h> #include <asm/numa.h> +#include <asm/fixmap.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/mpspec.h> |