Merge tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

torvalds · torvalds · commit 73344a3f6793 · 2022-10-14T13:47:42.000-07:00
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
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ void __iomem *marvel_ioportmap (unsigned long addr)`
`803`	`803`	`return (void __iomem *)addr;`
`804`	`804`	`}`
`805`	`805`
`806`		`-unsigned u8`
	`806`	`+u8`
`807`	`807`	`marvel_ioread8(const void __iomem *xaddr)`
`808`	`808`	`{`
`809`	`809`	`unsigned long addr = (unsigned long) xaddr;`