| Message ID | 1552659287-11246-6-git-send-email-philippe.reynes@softathome.com |
|---|---|
| State | Accepted |
| Commit | d28c5920cd40489bc1d75603c66658f3cf80579b |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Initial support of driver brcmnand (from kernel 4.18) | expand |
On Fri, Mar 15, 2019 at 03:14:34PM +0100, Philippe Reynes wrote: > 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 <philippe.reynes@softathome.com> Applied to u-boot/master, thanks!
diff --git a/include/linux/io.h b/include/linux/io.h index 9badab4..7984788 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 */
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 <philippe.reynes@softathome.com> --- include/linux/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)