summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/acinterp.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-18 13:49:29 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-18 13:49:29 +0100
commita090b22f3fafa9340f903834de87552b50c5f2ba (patch)
treed07b55c9d60d585f8ceed2c8f43e8a04309fc67e /drivers/acpi/acpica/acinterp.h
parent0b3571274b8ff53c0e08bc667ecd3d8a43bd8714 (diff)
parentb43e1065cab4b5be90c016b2f076086b70cd1556 (diff)
Merge branch 'acpica' into acpi-lpss
The following commits depend on the 'acpica' material.
Diffstat (limited to 'drivers/acpi/acpica/acinterp.h')
-rw-r--r--drivers/acpi/acpica/acinterp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index eb308635da7..16469b0e7b6 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -458,7 +458,7 @@ void acpi_ex_reacquire_interpreter(void);
void acpi_ex_relinquish_interpreter(void);
-void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc);
+u8 acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc);
void acpi_ex_acquire_global_lock(u32 rule);