diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acglobal.h | 1 | ||||
-rw-r--r-- | include/acpi/actbl.h | 3 | ||||
-rw-r--r-- | include/acpi/actbl1.h | 10 |
3 files changed, 0 insertions, 14 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index 8dab29a02e3c..d1a5363ffc40 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h | |||
@@ -144,7 +144,6 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags; | |||
144 | */ | 144 | */ |
145 | ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list; | 145 | ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list; |
146 | ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT; | 146 | ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT; |
147 | #define acpi_fadt acpi_gbl_FADT | ||
148 | extern acpi_native_uint acpi_gbl_permanent_mmap; | 147 | extern acpi_native_uint acpi_gbl_permanent_mmap; |
149 | 148 | ||
150 | /* These addresses are calculated from FADT address values */ | 149 | /* These addresses are calculated from FADT address values */ |
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h index 6f63b3bbc3fb..c5d5ec3638ef 100644 --- a/include/acpi/actbl.h +++ b/include/acpi/actbl.h | |||
@@ -236,9 +236,6 @@ struct acpi_table_fadt { | |||
236 | struct acpi_generic_address xgpe1_block; /* 64-bit Extended General Purpose Event 1 Reg Blk address */ | 236 | struct acpi_generic_address xgpe1_block; /* 64-bit Extended General Purpose Event 1 Reg Blk address */ |
237 | }; | 237 | }; |
238 | 238 | ||
239 | #define fadt_descriptor acpi_table_fadt | ||
240 | #define sci_int sci_interrupt | ||
241 | |||
242 | /* FADT flags */ | 239 | /* FADT flags */ |
243 | 240 | ||
244 | #define ACPI_FADT_WBINVD (1) /* 00: The wbinvd instruction works properly */ | 241 | #define ACPI_FADT_WBINVD (1) /* 00: The wbinvd instruction works properly */ |
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 3156d1ab61fe..b7178ebfe3e9 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h | |||
@@ -669,16 +669,6 @@ struct acpi_srat_mem_affinity { | |||
669 | #define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1) /* 01: Memory region is hot pluggable */ | 669 | #define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1) /* 01: Memory region is hot pluggable */ |
670 | #define ACPI_SRAT_MEM_NON_VOLATILE (1<<2) /* 02: Memory region is non-volatile */ | 670 | #define ACPI_SRAT_MEM_NON_VOLATILE (1<<2) /* 02: Memory region is non-volatile */ |
671 | 671 | ||
672 | /* Memory types */ | ||
673 | |||
674 | enum acpi_address_range_id { | ||
675 | ACPI_ADDRESS_RANGE_MEMORY = 1, | ||
676 | ACPI_ADDRESS_RANGE_RESERVED = 2, | ||
677 | ACPI_ADDRESS_RANGE_ACPI = 3, | ||
678 | ACPI_ADDRESS_RANGE_NVS = 4, | ||
679 | ACPI_ADDRESS_RANGE_COUNT = 5 | ||
680 | }; | ||
681 | |||
682 | /******************************************************************************* | 672 | /******************************************************************************* |
683 | * | 673 | * |
684 | * TCPA - Trusted Computing Platform Alliance table | 674 | * TCPA - Trusted Computing Platform Alliance table |