diff options
| author | Len Brown <len.brown@intel.com> | 2012-01-18 00:46:30 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-01-18 00:46:30 -0500 |
| commit | cb7971756b901abd61d47f6eb1011066abfb348d (patch) | |
| tree | c822e575f95c6f8ee5814648f6ccc1fb3226f6fc /include | |
| parent | 037d76f40430ba1269dc7d1fee22382cd9672997 (diff) | |
| parent | 700130b41f4ee54520ac2ef2f7f1d072789711a4 (diff) | |
Merge branch 'atomicio-remove' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi_io.h | 3 |
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, | |||
| 12 | 12 | ||
| 13 | void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size); | 13 | void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size); |
| 14 | 14 | ||
| 15 | int acpi_os_map_generic_address(struct acpi_generic_address *addr); | ||
| 16 | void acpi_os_unmap_generic_address(struct acpi_generic_address *addr); | ||
| 17 | |||
| 15 | #endif | 18 | #endif |