summaryrefslogtreecommitdiff
path: root/arch/microblaze/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-02 20:48:36 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-02 20:48:36 +0300
commit44644391ff1817fa01b1ae4a7e52af8a23e0baa2 (patch)
treecaa93c353bbf80edb8e897ed34968a5614729b5b /arch/microblaze/include
parent4bf772b14675411a69b3c807f73006de0fe4b649 (diff)
parent7b6ce52be3f86520524711a6f33f3866f9339694 (diff)
downloadlinux-44644391ff1817fa01b1ae4a7e52af8a23e0baa2.tar.xz
Merge tag 'microblaze-4.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek: - Fix endian handling and Kconfig dependency - Fix iounmap prototype * tag 'microblaze-4.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Setup proper dependency for optimized lib functions microblaze: fix iounmap prototype microblaze: fix endian handling
Diffstat (limited to 'arch/microblaze/include')
-rw-r--r--arch/microblaze/include/asm/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 39b6315db82e..c7968139486f 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -36,7 +36,7 @@ extern resource_size_t isa_mem_base;
#ifdef CONFIG_MMU
#define page_to_bus(page) (page_to_phys(page))
-extern void iounmap(void __iomem *addr);
+extern void iounmap(volatile void __iomem *addr);
extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
#define ioremap_nocache(addr, size) ioremap((addr), (size))