diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
| commit | a090b22f3fafa9340f903834de87552b50c5f2ba (patch) | |
| tree | d07b55c9d60d585f8ceed2c8f43e8a04309fc67e /include/acpi/actbl.h | |
| parent | 0b3571274b8ff53c0e08bc667ecd3d8a43bd8714 (diff) | |
| parent | b43e1065cab4b5be90c016b2f076086b70cd1556 (diff) | |
Merge branch 'acpica' into acpi-lpss
The following commits depend on the 'acpica' material.
Diffstat (limited to 'include/acpi/actbl.h')
| -rw-r--r-- | include/acpi/actbl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h index 4f94b1d812d..ee050e86d17 100644 --- a/include/acpi/actbl.h +++ b/include/acpi/actbl.h @@ -326,8 +326,6 @@ enum acpi_preferred_pm_profiles { #pragma pack() -#define ACPI_FADT_OFFSET(f) (u16) ACPI_OFFSET (struct acpi_table_fadt, f) - /* * Internal table-related structures */ @@ -359,11 +357,14 @@ struct acpi_table_desc { /* * Get the remaining ACPI tables */ - #include <acpi/actbl1.h> #include <acpi/actbl2.h> #include <acpi/actbl3.h> +/* Macros used to generate offsets to specific table fields */ + +#define ACPI_FADT_OFFSET(f) (u16) ACPI_OFFSET (struct acpi_table_fadt, f) + /* * Sizes of the various flavors of FADT. We need to look closely * at the FADT length because the version number essentially tells |