From aa40620e1fabbad7ac601f6629feabb1073c47bb Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Thu, 10 Apr 2008 19:06:37 +0400
Subject: [PATCH] --- yaml --- r: 95422 b: refs/heads/master c:
 dbaaa9567543191faa933e78f979f5ff7385918c h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/acpi/acglobal.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ac0b996dca6..0ab195655233 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b6e16cf2bacbf328535097fa74f1494b1873c54
+refs/heads/master: dbaaa9567543191faa933e78f979f5ff7385918c
diff --git a/trunk/include/acpi/acglobal.h b/trunk/include/acpi/acglobal.h
index e91008eaef2d..44e718ee1579 100644
--- a/trunk/include/acpi/acglobal.h
+++ b/trunk/include/acpi/acglobal.h
@@ -238,6 +238,10 @@ ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;
 ACPI_EXTERN u8 acpi_gbl_events_initialized;
 ACPI_EXTERN u8 acpi_gbl_system_awake_and_running;
 
+#ifndef DEFINE_ACPI_GLOBALS
+
+/* Other miscellaneous */
+
 extern u8 acpi_gbl_shutdown;
 extern u32 acpi_gbl_startup_flags;
 extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT];
@@ -245,6 +249,8 @@ extern const char *acpi_gbl_highest_dstate_names[4];
 extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];
 extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 
+#endif
+
 /* Exception codes */
 
 extern char const *acpi_gbl_exception_names_env[];