summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpiosxf.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-05-10 02:49:34 -0400
committerLen Brown <len.brown@intel.com>2007-05-10 02:49:34 -0400
commit71b43ca46fc5f0588ef64a14c6133c19a9b3f1ea (patch)
treeaf25c06aa1af3ff2c210fe4b39abfdda55b84349 /include/acpi/acpiosxf.h
parent3dd6786f55219f87fd33e153669600d715ca9270 (diff)
parentfd3509436fde38d4c854bf5a6b83d2c779904f8e (diff)
downloadblackbird-op-linux-71b43ca46fc5f0588ef64a14c6133c19a9b3f1ea.tar.gz
blackbird-op-linux-71b43ca46fc5f0588ef64a14c6133c19a9b3f1ea.zip
Pull acpica into release branch
Diffstat (limited to 'include/acpi/acpiosxf.h')
-rw-r--r--include/acpi/acpiosxf.h3
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);
OpenPOWER on IntegriCloud