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

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

include/asm-generic/io.h

+1 −2
Original line number Diff line number Diff line
@@ -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