diff options
| author | Linus Torvalds | 2007-05-10 13:30:34 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2007-05-10 13:30:34 -0700 |
| commit | b526ca438b95a6d71210e0ffc79aabac8aba2b1e (patch) | |
| tree | 7b162fa7d99405c5ad0110b6f4a4db05ff9e48d5 /include/acpi/acpiosxf.h | |
| parent | 9b6a51746ffe8d619f1097675d2dc5e303470024 (diff) | |
| parent | f685648e7d6520653fa2641840cccc58ba8ef8e0 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
acpi,msi-laptop: Fall back to EC polling mode for MSI laptop specific EC commands
sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT
asus-laptop: version bump and lindent
asus-laptop: fix light sens init
asus-laptop: add GPS support
asus-laptop: notify ALL events
ACPICA: Lindent
ACPI: created a dedicated workqueue for notify() execution
Revert "ACPICA: fix AML mutex re-entrancy"
Revert "Execute AML Notify() requests on stack."
Revert "ACPICA: revert "acpi_serialize" changes"
ACPI: delete un-reliable concept of cooling mode
ACPI: thermal trip points are read-only
Diffstat (limited to 'include/acpi/acpiosxf.h')
| -rw-r--r-- | include/acpi/acpiosxf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 2785058c82ab..5e07db0d46e9 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -143,7 +143,8 @@ void acpi_os_release_mutex(acpi_mutex handle); */ void *acpi_os_allocate(acpi_size size); -void __iomem *acpi_os_map_memory(acpi_physical_address where, acpi_native_uint length); +void __iomem *acpi_os_map_memory(acpi_physical_address where, + acpi_native_uint length); void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size); |