summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-01-18 00:46:30 -0500
committerLen Brown <len.brown@intel.com>2012-01-18 00:46:30 -0500
commitcb7971756b901abd61d47f6eb1011066abfb348d (patch)
treec822e575f95c6f8ee5814648f6ccc1fb3226f6fc /include
parent037d76f40430ba1269dc7d1fee22382cd9672997 (diff)
parent700130b41f4ee54520ac2ef2f7f1d072789711a4 (diff)
Merge branch 'atomicio-remove' into release
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi_io.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/acpi_io.h b/include/linux/acpi_io.h
index 4afd7102459d..b0ffa219993e 100644
--- a/include/linux/acpi_io.h
+++ b/include/linux/acpi_io.h
@@ -12,4 +12,7 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
+int acpi_os_map_generic_address(struct acpi_generic_address *addr);
+void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);
+
#endif