Commit ea962928 authored by Hector Martin's avatar Hector Martin Committed by Arnd Bergmann

asm-generic/io.h: Unbork ioremap_np() declaration

It accidentally slipped into the #ifdef for ioremap_uc().
Signed-off-by: default avatarHector Martin <marcan@marcan.st>
Link: https://lore.kernel.org/r/20210409052038.58925-1-marcan@marcan.st'
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 1bb2fd38
...@@ -995,6 +995,7 @@ static inline void __iomem *ioremap_uc(phys_addr_t offset, size_t size) ...@@ -995,6 +995,7 @@ static inline void __iomem *ioremap_uc(phys_addr_t offset, size_t size)
{ {
return NULL; return NULL;
} }
#endif
/* /*
* ioremap_np needs an explicit architecture implementation, as it * ioremap_np needs an explicit architecture implementation, as it
...@@ -1013,8 +1014,6 @@ static inline void __iomem *ioremap_np(phys_addr_t offset, size_t size) ...@@ -1013,8 +1014,6 @@ static inline void __iomem *ioremap_np(phys_addr_t offset, size_t size)
} }
#endif #endif
#endif
#ifdef CONFIG_HAS_IOPORT_MAP #ifdef CONFIG_HAS_IOPORT_MAP
#ifndef CONFIG_GENERIC_IOMAP #ifndef CONFIG_GENERIC_IOMAP
#ifndef ioport_map #ifndef ioport_map
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment