summaryrefslogtreecommitdiff
path: root/tools/power/acpi/os_specific/service_layers/osunixmap.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 17:58:57 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 17:58:57 +0300
commit55c39fc2b18c384f51d8ed47678cca851b80a063 (patch)
treed3263b37f61f29fc41bd504f731f82f4bfdf9a1c /tools/power/acpi/os_specific/service_layers/osunixmap.c
parentbfa76d49576599a4b9f9b7a71f23d73d6dcff735 (diff)
parent2eedd3d8398b266ee8e846ded03218bb6a00e2c1 (diff)
downloadlinux-55c39fc2b18c384f51d8ed47678cca851b80a063.tar.xz
Merge branch 'acpica'
* acpica: ACPICA: Events: Enable APIs to allow interrupt/polling adaptive request based GPE handling model ACPICA: Events: Introduce acpi_set_gpe()/acpi_finish_gpe() to reduce divergences ACPICA: Events: Introduce ACPI_GPE_DISPATCH_RAW_HANDLER to fix 2 issues for the current GPE APIs ACPICA: Update version to 20150204 ACPICA: Update Copyright headers to 2015 ACPICA: Hardware: Cast GPE enable_mask before storing ACPICA: Events: Cleanup GPE dispatcher type obtaining code ACPICA: Events: Cleanup to move acpi_gbl_global_event_handler invocation out of acpi_ev_gpe_dispatch() ACPICA: Events: Cleanup of resetting the GPE handler to NULL before removing ACPICA: Events: Fix uninitialized variable ACPICA: Events: Remove acpi_ev_valid_gpe_event() due to current restriction ACPICA: Events: Remove duplicated sanity check in acpi_ev_enable_gpe() ACPICA: Events: Back port "ACPICA: Save current masks of enabled GPEs after enable register writes" ACPICA: Resources: Provide common part for struct acpi_resource_address structures. ACPI: Introduce acpi_unload_parent_table() usages in Linux kernel ACPICA: take ACPI_MTX_INTERPRETER in acpi_unload_table_id()
Diffstat (limited to 'tools/power/acpi/os_specific/service_layers/osunixmap.c')
-rw-r--r--tools/power/acpi/os_specific/service_layers/osunixmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/acpi/os_specific/service_layers/osunixmap.c b/tools/power/acpi/os_specific/service_layers/osunixmap.c
index 99b47b6194a3..3853a7350440 100644
--- a/tools/power/acpi/os_specific/service_layers/osunixmap.c
+++ b/tools/power/acpi/os_specific/service_layers/osunixmap.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without