diff options
| author | Mark Brown <broonie@kernel.org> | 2023-10-23 19:38:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-23 19:38:22 +0100 |
| commit | 4fc4db7a68c2c04522880c4f89317f7874a4188f (patch) | |
| tree | dc7e38eb44e2e4eb177245c157869ff301287590 /arch/sh | |
| parent | 61f85372d293241f4139731c14cab9ac8e9436fb (diff) | |
| parent | 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff) | |
ASoC: Merge up v6.6-rc7
Get fixes needed so we can enable build of ams-delta in more
configurations.
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/mm/ioremap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c index c33b3daa4ad1..33d20f34560f 100644 --- a/arch/sh/mm/ioremap.c +++ b/arch/sh/mm/ioremap.c @@ -72,8 +72,8 @@ __ioremap_29bit(phys_addr_t offset, unsigned long size, pgprot_t prot) #define __ioremap_29bit(offset, size, prot) NULL #endif /* CONFIG_29BIT */ -void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, - unsigned long prot) +void __iomem __ref *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot) { void __iomem *mapped; pgprot_t pgprot = __pgprot(prot); |