From: Hector Martin <marcan@marcan.st>
Date: Fri, 9 Apr 2021 05:20:38 +0000 (+0900)
Subject: asm-generic/io.h: Unbork ioremap_np() declaration
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ea96292838397682530ac77a429974f8ff5f2df3;p=linux.git

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

It accidentally slipped into the #ifdef for ioremap_uc().

Signed-off-by: Hector Martin <marcan@marcan.st>
Link: https://lore.kernel.org/r/20210409052038.58925-1-marcan@marcan.st'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 082e0c96db6e1..76d456c516a13 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -995,6 +995,7 @@ static inline void __iomem *ioremap_uc(phys_addr_t offset, size_t size)
 {
 	return NULL;
 }
+#endif
 
 /*
  * 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)
 }
 #endif
 
-#endif
-
 #ifdef CONFIG_HAS_IOPORT_MAP
 #ifndef CONFIG_GENERIC_IOMAP
 #ifndef ioport_map