diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2012-10-31 02:25:36 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 00:31:23 +0100 |
| commit | 644ef74e6d187ca2e8a23ff41a513964de36f93e (patch) | |
| tree | e9dff693037687f98ef7027f2f65f0f79fe5ac15 /drivers/acpi/sysfs.c | |
| parent | 78e25fef2751434f38c7f711ecbf8762f79f7318 (diff) | |
| download | linux-644ef74e6d187ca2e8a23ff41a513964de36f93e.tar.gz linux-644ef74e6d187ca2e8a23ff41a513964de36f93e.tar.bz2 linux-644ef74e6d187ca2e8a23ff41a513964de36f93e.zip | |
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/sysfs.c')
| -rw-r--r-- | drivers/acpi/sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index 7c3f98ba4afe..ea61ca9129cd 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c @@ -476,7 +476,7 @@ static void fixed_event_count(u32 event_number) return; } -static void acpi_gbl_event_handler(u32 event_type, acpi_handle device, +static void acpi_global_event_handler(u32 event_type, acpi_handle device, u32 event_number, void *context) { if (event_type == ACPI_EVENT_TYPE_GPE) @@ -638,7 +638,7 @@ void acpi_irq_stats_init(void) if (all_counters == NULL) goto fail; - status = acpi_install_global_event_handler(acpi_gbl_event_handler, NULL); + status = acpi_install_global_event_handler(acpi_global_event_handler, NULL); if (ACPI_FAILURE(status)) goto fail; |