projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1bb2fd3
)
asm-generic/io.h: Unbork ioremap_np() declaration
author
Hector Martin
<marcan@marcan.st>
Fri, 9 Apr 2021 05:20:38 +0000
(14:20 +0900)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 9 Apr 2021 06:48:27 +0000
(08:48 +0200)
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>
include/asm-generic/io.h
patch
|
blob
|
history
diff --git
a/include/asm-generic/io.h
b/include/asm-generic/io.h
index 082e0c96db6e1b12788f3521d7c84acc04f3bffc..76d456c516a137d225357b7fdea978a0826cd2c8 100644
(file)
--- 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