aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>2007-02-02 11:48:22 -0500
committerLen Brown <len.brown@intel.com>2007-02-02 21:14:28 -0500
commitcee324b145a1e5488b34191de670e5ed1d346ebb (patch)
tree9e00f815bda0db1a134b23c9495a71e643724c58 /include/acpi
parentceb6c46839021d5c7c338d48deac616944660124 (diff)
ACPICA: use new ACPI headers.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acglobal.h1
-rw-r--r--include/acpi/actbl.h3
-rw-r--r--include/acpi/actbl1.h10
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 */
145ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list; 145ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
146ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT; 146ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
147#define acpi_fadt acpi_gbl_FADT
148extern acpi_native_uint acpi_gbl_permanent_mmap; 147extern 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
674enum 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