From: Philippe Reynes Date: Fri, 15 Mar 2019 14:14:34 +0000 (+0100) Subject: include: linux: io: define devm_ioremap on board with ioremap X-Git-Tag: v2019.07-rc1~11^2~56 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d28c5920cd40489bc1d75603c66658f3cf80579b;p=oweals%2Fu-boot.git include: linux: io: define devm_ioremap on board with ioremap The macro devm_ioremap is only defined for configuration that doesn't have ioremap. But this macro may also be defined on configuration with ioremap. This patch remove the condition for the macro devm_ioremap, so it's always defined. Signed-off-by: Philippe Reynes --- diff --git a/include/linux/io.h b/include/linux/io.h index 9badab49b0..79847886be 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -65,8 +65,8 @@ static inline void __iomem *ioremap(resource_size_t offset, static inline void iounmap(void __iomem *addr) { } +#endif #define devm_ioremap(dev, offset, size) ioremap(offset, size) -#endif #endif /* _LINUX_IO_H */