summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/utglobal.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2013-08-08 11:29:46 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-13 15:13:09 +0400
commit2641f540800b47a1b9e9d8ce9d682fc15df088e2 (patch)
tree68033c6e7648ff842f102fd75a01849f4c577f39 /drivers/acpi/acpica/utglobal.c
parentbf0dd264b1207b090858e7847919af5f2e367d7c (diff)
downloadlinux-2641f540800b47a1b9e9d8ce9d682fc15df088e2.tar.xz
ACPICA: Fix divergences of the commit - ACPICA: Expose OSI version.
The original commit 242b2287cd7f27521c8b54a4101d569e53e7a0ca "ACPICA: expose OSI version" triggers build errors in ACPICA when it is back ported. The patch removes the divergences between Linux and upstream ACPICA resulting from that. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/utglobal.c')
-rw-r--r--drivers/acpi/acpica/utglobal.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index f736448a8606..d6f26bf8a062 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -336,7 +336,6 @@ acpi_status acpi_ut_init_globals(void)
acpi_gbl_trace_dbg_layer = 0;
acpi_gbl_debugger_configuration = DEBUGGER_THREADING;
acpi_gbl_db_output_flags = ACPI_DB_CONSOLE_OUTPUT;
- acpi_gbl_osi_data = 0;
acpi_gbl_osi_mutex = NULL;
acpi_gbl_reg_methods_executed = FALSE;