Merge tag 'v3.9-rc2' into next

[karo-tx-linux.git] / arch / microblaze / include / asm / io.h

diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 4fbfdc1ac7f86c987fb3530fb3d76769e5b02cf6..8cb8a8566edea40d3df6aaa20a373fbd23390138 100644 (file)
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -150,7 +150,7 @@ static inline void writel(unsigned int v, volatile void __iomem *addr)
 #define page_to_bus(page)      (page_to_phys(page))
 #define bus_to_virt(addr)      (phys_to_virt(addr))
 
-extern void iounmap(void *addr);
+extern void iounmap(void __iomem *addr);
 /*extern void *__ioremap(phys_addr_t address, unsigned long size,
                unsigned long flags);*/
 extern void __iomem *ioremap(phys_addr_t address, unsigned long size);