Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[powerpc.git] / include / acpi / actbl1.h

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 515d82c..4e5d3ca 100644 (file)
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97,6 +97,8 @@ struct acpi_subtable_header {
  *
  * ASF - Alert Standard Format table (Signature "ASF!")
  *
+ * Conforms to the Alert Standard Format Specification V2.0, 23 April 2003
+ *
  ******************************************************************************/
 
 struct acpi_table_asf {
@@ -146,7 +148,21 @@ struct acpi_asf_alert {
        u8 deassert_mask;
        u8 alerts;
        u8 data_length;
-       u8 array[1];
+};
+
+struct acpi_asf_alert_data {
+       u8 address;
+       u8 command;
+       u8 mask;
+       u8 value;
+       u8 sensor_type;
+       u8 type;
+       u8 offset;
+       u8 source_type;
+       u8 severity;
+       u8 sensor_number;
+       u8 entity;
+       u8 instance;
 };
 
 /* 2: ASF Remote Control */
@@ -156,7 +172,13 @@ struct acpi_asf_remote {
        u8 controls;
        u8 data_length;
        u16 reserved2;
-       u8 array[1];
+};
+
+struct acpi_asf_control_data {
+       u8 function;
+       u8 address;
+       u8 command;
+       u8 value;
 };
 
 /* 3: ASF RMCP Boot Options */
@@ -178,7 +200,6 @@ struct acpi_asf_address {
        struct acpi_asf_header header;
        u8 eprom_address;
        u8 devices;
-       u8 smbus_addresses[1];
 };
 
 /*******************************************************************************
@@ -648,16 +669,6 @@ struct acpi_srat_mem_affinity {
 #define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1)     /* 01: Memory region is hot pluggable */
 #define ACPI_SRAT_MEM_NON_VOLATILE  (1<<2)     /* 02: Memory region is non-volatile */
 
-/* Memory types */
-
-enum acpi_address_range_id {
-       ACPI_ADDRESS_RANGE_MEMORY = 1,
-       ACPI_ADDRESS_RANGE_RESERVED = 2,
-       ACPI_ADDRESS_RANGE_ACPI = 3,
-       ACPI_ADDRESS_RANGE_NVS = 4,
-       ACPI_ADDRESS_RANGE_COUNT = 5
-};
-
 /*******************************************************************************
  *
  * TCPA - Trusted Computing Platform Alliance table