---

yaml --- r: 95422 b: refs/heads/master c: dbaaa95 h: refs/heads/master v: v3
git-mirror · Apr 22, 2008 · aa40620 · aa40620
1 parent 168cc2e
commit aa40620
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -238,13 +238,19 @@ 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];
 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[];