Merge branch 'atomicio-remove' into release

2012-01-18 00:46:30 -05:00
parent 037d76f404 700130b41f
commit cb7971756b
5 changed files with 133 additions and 25 deletions
@@ -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