Vendor import of the Intel ACPI CA 20010615 snapshot.

1 files changed, 10 insertions, 13 deletions

diff --git a/sys/contrib/dev/acpica/acoutput.h b/sys/contrib/dev/acpica/acoutput.h
index f2746a83da66..4c647341d789 100644
--- a/sys/contrib/dev/acpica/acoutput.h
+++ b/sys/contrib/dev/acpica/acoutput.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acoutput.h -- debug output
- *       $Revision: 77 $
+ *       $Revision: 78 $
  *
  *****************************************************************************/
 
@@ -134,23 +134,20 @@
 #define ACPI_DISPATCHER             0x00000040
 #define ACPI_EXECUTER               0x00000080
 #define ACPI_RESOURCES              0x00000100
-#define ACPI_DEVICES                0x00000200
-#define ACPI_POWER                  0x00000400
+#define ACPI_DEBUGGER               0x00000200
+#define ACPI_OS_SERVICES            0x00000400
 
-
-#define ACPI_BUS_MANAGER            0x00001000
-#define ACPI_POWER_CONTROL          0x00002000
-#define ACPI_EMBEDDED_CONTROLLER    0x00004000
-#define ACPI_PROCESSOR_CONTROL      0x00008000
+#define ACPI_BUS                    0x00001000
+#define ACPI_SYSTEM                 0x00002000
+#define ACPI_POWER                  0x00004000
+#define ACPI_EC                     0x00008000
 #define ACPI_AC_ADAPTER             0x00010000
 #define ACPI_BATTERY                0x00020000
 #define ACPI_BUTTON                 0x00040000
-#define ACPI_SYSTEM                 0x00080000
-#define ACPI_THERMAL_ZONE           0x00100000
+#define ACPI_PROCESSOR              0x00080000
+#define ACPI_THERMAL                0x00100000
 
-#define ACPI_DEBUGGER               0x01000000
-#define ACPI_OS_SERVICES            0x02000000
-#define ACPI_ALL_COMPONENTS         0x01FFFFFF
+#define ACPI_ALL_COMPONENTS         0x00FFFFFF
 
 #define ACPI_COMPONENT_DEFAULT      (ACPI_ALL_COMPONENTS)