aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/acpixf.h
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2013-01-12 10:29:38 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-11 07:10:16 -0500
commitb43e1065cab4b5be90c016b2f076086b70cd1556 (patch)
treee2b71a6c52a5a3088b37880495984aa4ad997e34 /include/acpi/acpixf.h
parent42f8fb75c43cc67f06424f991009b3af674f93eb (diff)
ACPICA: Cleanup table handler naming conflicts.
This is a cosmetic patch only. Comparison of the resulting binary showed only line number differences. This patch does not affect the generation of the Linux binary. This patch decreases 44 lines of 20121114 divergence.diff. There are naming conflicts between Linux and ACPICA on table handlers. This patch cleans up this conflicts to reduce the source code diff between Linux and ACPICA. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/acpixf.h')
-rw-r--r--include/acpi/acpixf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index b86364d48645..d8b2ea673fc6 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -197,9 +197,9 @@ acpi_status
197acpi_get_table_by_index(u32 table_index, struct acpi_table_header **out_table); 197acpi_get_table_by_index(u32 table_index, struct acpi_table_header **out_table);
198 198
199acpi_status 199acpi_status
200acpi_install_table_handler(acpi_tbl_handler handler, void *context); 200acpi_install_table_handler(acpi_table_handler handler, void *context);
201 201
202acpi_status acpi_remove_table_handler(acpi_tbl_handler handler); 202acpi_status acpi_remove_table_handler(acpi_table_handler handler);
203 203
204/* 204/*
205 * Namespace and name interfaces 205 * Namespace and name interfaces