diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 12:26:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 12:26:37 -0400 |
| commit | ffaa5b984a9322bbd5d9a7f0814ca2ce70feebe5 (patch) | |
| tree | 171ed020ae3f9034150e832c613b650e803b62fb /include | |
| parent | 024b246ed24492d6c2ee14c34d742b137fce1b94 (diff) | |
| parent | 0f2456236459f3ddef48a8a75d10b2d6ecf1a93d (diff) | |
Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6
* 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6:
ACPI: Fix thermal shutdowns
ACPI: bounds check IRQ to prevent memory corruption
ACPI: Avoid bogus EC timeout when EC is in Polling mode
ACPI : Add the EC dmi table to fix the incorrect ECDT table
ACPI: Properly clear flags on false-positives and send uevent on sudden unplug
acpi: trivial cleanups
acer-wmi: Fix wireless and bluetooth on early AMW0 v2 laptops
ACPI: WMI: Set instance for query block calls
ACPICA: Additional error checking for pathname utilities
ACPICA: Fix possible memory leak in Unload() operator
ACPICA: Fix memory leak when deleting thermal/processor objects
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acnamesp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h index 9ed70a050580..c34008507b69 100644 --- a/include/acpi/acnamesp.h +++ b/include/acpi/acnamesp.h | |||
| @@ -182,7 +182,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info); | |||
| 182 | */ | 182 | */ |
| 183 | u32 acpi_ns_opens_scope(acpi_object_type type); | 183 | u32 acpi_ns_opens_scope(acpi_object_type type); |
| 184 | 184 | ||
| 185 | void | 185 | acpi_status |
| 186 | acpi_ns_build_external_path(struct acpi_namespace_node *node, | 186 | acpi_ns_build_external_path(struct acpi_namespace_node *node, |
| 187 | acpi_size size, char *name_buffer); | 187 | acpi_size size, char *name_buffer); |
| 188 | 188 | ||