diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
| commit | 985f38781d19101aba121df423f92c87b208c6df (patch) | |
| tree | 21b10413b6e24c0eaf5c3b2432e936749a672644 /drivers/acpi/acpica/acinterp.h | |
| parent | d093d70a81b08673d1577ad73419998f02be9d29 (diff) | |
| parent | c9766237afa92e8d7f27bbcd4964f1b43fa0bce8 (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'drivers/acpi/acpica/acinterp.h')
| -rw-r--r-- | drivers/acpi/acpica/acinterp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h index e8db7a3143a5..5db9f2916f7c 100644 --- a/drivers/acpi/acpica/acinterp.h +++ b/drivers/acpi/acpica/acinterp.h | |||
| @@ -461,9 +461,9 @@ void acpi_ex_acquire_global_lock(u32 rule); | |||
| 461 | 461 | ||
| 462 | void acpi_ex_release_global_lock(u32 rule); | 462 | void acpi_ex_release_global_lock(u32 rule); |
| 463 | 463 | ||
| 464 | void acpi_ex_eisa_id_to_string(u32 numeric_id, char *out_string); | 464 | void acpi_ex_eisa_id_to_string(char *dest, acpi_integer compressed_id); |
| 465 | 465 | ||
| 466 | void acpi_ex_unsigned_integer_to_string(acpi_integer value, char *out_string); | 466 | void acpi_ex_integer_to_string(char *dest, acpi_integer value); |
| 467 | 467 | ||
| 468 | /* | 468 | /* |
| 469 | * exregion - default op_region handlers | 469 | * exregion - default op_region handlers |