summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-10-14 13:47:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-10-14 13:47:42 -0700
commit73344a3f6793d6b5384077be1e5ce6b90bbcaeb4 (patch)
tree77708c97a624efc11adde4161da8995805ede23b
parentca1aaf993755d21b8a0060c3bf0f77e303a7bf21 (diff)
parent2e21c1575208786f667cb66d8cf87a52160b81db (diff)
Merge tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic fix from Arnd Bergmann: "A last-minute arch/alpha regression fix: the previous asm-generic branch contained a new regression from a typo" * tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: alpha: fix marvel_ioread8 build regression
-rw-r--r--arch/alpha/kernel/core_marvel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 6d0b3baf97ff..e9348aec4649 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -803,7 +803,7 @@ void __iomem *marvel_ioportmap (unsigned long addr)
return (void __iomem *)addr;
}
-unsigned u8
+u8
marvel_ioread8(const void __iomem *xaddr)
{
unsigned long addr = (unsigned long) xaddr;