From: Bob Moore <robert.moore@intel.com>
Date: Thu, 10 Apr 2008 15:06:37 +0000 (+0400)
Subject: ACPICA: Fixed a couple compiler warnings for extra extern statements
X-Git-Tag: v2.6.26-rc1~101^2~67
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbaaa9567543191faa933e78f979f5ff7385918c;p=linux-2.6

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>
---

diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index e91008eaef..44e718ee15 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[];