Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes

[karo-tx-linux.git] / include / acpi / acpi_io.h

diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h
index 444671e9c65db3db323182081651282f40b847f6..dd86c5fc102d4798199f04f05e95998a7bb4d643 100644 (file)
--- a/include/acpi/acpi_io.h
+++ b/include/acpi/acpi_io.h
@@ -3,11 +3,15 @@
 
 #include <linux/io.h>
 
+#include <asm/acpi.h>
+
+#ifndef acpi_os_ioremap
 static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
                                            acpi_size size)
 {
        return ioremap_cache(phys, size);
 }
+#endif
 
 void __iomem *__init_refok
 acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);