summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHector Martin <marcan@marcan.st>2021-04-09 14:20:38 +0900
committerArnd Bergmann <arnd@arndb.de>2021-04-09 08:48:27 +0200
commitea96292838397682530ac77a429974f8ff5f2df3 (patch)
tree6d31c7c632508081e2239a6f552524da587b8e28
parent1bb2fd3880d479a7a1bf833baee731ae69f09060 (diff)
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>
-rw-r--r--include/asm-generic/io.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 082e0c96db6e..76d456c516a1 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