summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/acglobal.h
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2012-10-31 02:25:36 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-15 00:31:23 +0100
commit644ef74e6d187ca2e8a23ff41a513964de36f93e (patch)
treee9dff693037687f98ef7027f2f65f0f79fe5ac15 /drivers/acpi/acpica/acglobal.h
parent78e25fef2751434f38c7f711ecbf8762f79f7318 (diff)
downloadop-kernel-dev-644ef74e6d187ca2e8a23ff41a513964de36f93e.zip
op-kernel-dev-644ef74e6d187ca2e8a23ff41a513964de36f93e.tar.gz
ACPICA: Fix AcpiSrc caused divergences.
There are definitions that can been converted into new styles by the recent AcpiSrc while they remain the old styles in the Linux. This patch fixes those definitions that will be converted by the AcpiSrc. This patch will not affect the generated vmlinux binary. This will decrease 97 lines of 20120913 divergence.diff. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/acglobal.h')
-rw-r--r--drivers/acpi/acpica/acglobal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index fe20e18..35006d1 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -376,7 +376,7 @@ ACPI_EXTERN struct acpi_gpe_block_info
#if (!ACPI_REDUCED_HARDWARE)
ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;
-ACPI_EXTERN ACPI_GBL_EVENT_HANDLER acpi_gbl_global_event_handler;
+ACPI_EXTERN acpi_gbl_event_handler acpi_gbl_global_event_handler;
ACPI_EXTERN void *acpi_gbl_global_event_handler_context;
#endif /* !ACPI_REDUCED_HARDWARE */
OpenPOWER on IntegriCloud