Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[firefly-linux-kernel-4.4.55.git] / include / linux / io.h

diff --git a/include/linux/io.h b/include/linux/io.h
index 85533ec5aaa17f4146452a16ef61ca40fc601c80..aa3f5af670b579bc9de78a9d1a4075daa6c039c2 100644 (file)
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -19,7 +19,12 @@
 #define _LINUX_IO_H
 
 #include <asm/io.h>
+#include <asm/page.h>
 
 void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
+void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
+
+int ioremap_page_range(unsigned long addr, unsigned long end,
+                      unsigned long phys_addr, pgprot_t prot);
 
 #endif /* _LINUX_IO_H */