summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2008-04-10 19:06:37 +0400
committerLen Brown <len.brown@intel.com>2008-04-22 14:29:21 -0400
commitdbaaa9567543191faa933e78f979f5ff7385918c (patch)
treed7d1f58fb58fc4680b06ba3b235bd422c0abcd12 /include/acpi
parent4b6e16cf2bacbf328535097fa74f1494b1873c54 (diff)
downloadlinux-dbaaa9567543191faa933e78f979f5ff7385918c.tar.gz
linux-dbaaa9567543191faa933e78f979f5ff7385918c.tar.bz2
linux-dbaaa9567543191faa933e78f979f5ff7385918c.zip
ACPICA: Fixed a couple compiler warnings for extra extern statements
Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acglobal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index e91008eaef2d..44e718ee1579 100644
--- a/include/acpi/acglobal.h
+++ b/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[];