diff options
author | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 13:29:39 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 13:29:39 -0500 |
commit | 85ce230051c37dfb979385eb0244bf3655625ba6 (patch) | |
tree | 90abeab25f8c1ea4836b38279790b90f0c780ae3 /drivers/acpi/acpica/acglobal.h | |
parent | pmem, memremap: convert to numa aware allocations (diff) | |
parent | acpi: nfit: Add support for hot-add (diff) | |
download | linux-dev-85ce230051c37dfb979385eb0244bf3655625ba6.tar.xz linux-dev-85ce230051c37dfb979385eb0244bf3655625ba6.zip |
Merge branch 'for-4.4/hotplug' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/acpica/acglobal.h')
-rw-r--r-- | drivers/acpi/acpica/acglobal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h index 09f37b516808..4dde37c3d8fc 100644 --- a/drivers/acpi/acpica/acglobal.h +++ b/drivers/acpi/acpica/acglobal.h @@ -61,6 +61,7 @@ ACPI_GLOBAL(struct acpi_table_header, acpi_gbl_original_dsdt_header); ACPI_INIT_GLOBAL(u32, acpi_gbl_dsdt_index, ACPI_INVALID_TABLE_INDEX); ACPI_INIT_GLOBAL(u32, acpi_gbl_facs_index, ACPI_INVALID_TABLE_INDEX); ACPI_INIT_GLOBAL(u32, acpi_gbl_xfacs_index, ACPI_INVALID_TABLE_INDEX); +ACPI_INIT_GLOBAL(u32, acpi_gbl_fadt_index, ACPI_INVALID_TABLE_INDEX); #if (!ACPI_REDUCED_HARDWARE) ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_FACS); |