Skip to content

Commit f3e8416

Browse files
committed
Merge tag 'soc-fixes-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fix from Arnd Bergmann: "One last build fix came in, addressing a link failure when building without CONFIG_OUTER_CACHE" * tag 'soc-fixes-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: at91: fix build for SAMA5D3 w/o L2 cache
2 parents 7f043b7 + da0cbf9 commit f3e8416

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/mach-at91/sama5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static void sama5_l2c310_write_sec(unsigned long val, unsigned reg)
2626
static void __init sama5_secure_cache_init(void)
2727
{
2828
sam_secure_init();
29-
if (sam_linux_is_optee_available())
29+
if (IS_ENABLED(CONFIG_OUTER_CACHE) && sam_linux_is_optee_available())
3030
outer_cache.write_sec = sama5_l2c310_write_sec;
3131
}
3232

0 commit comments

Comments
 (0)