5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit ef1db3d1d2bf which is commit 0309f714a0908e947af1c902cf6a330cb593e75e upstream. It is reported to cause build errors in m68k, so revert it. Link: https://lore.kernel.org/r/68b0559e-47e8-4756-b3de-67d59242756e@xxxxxxxxxxxx Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx> Cc: Ross Burton <ross.burton@xxxxxxx> Cc: Sudeep Holla <sudeep.holla@xxxxxxx> Cc: Mark Rutland <mark.rutland@xxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxx> Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/clocksource/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -398,8 +398,7 @@ config ARM_GLOBAL_TIMER This option enables support for the ARM global timer unit. config ARM_TIMER_SP804 - bool "Support for Dual Timer SP804 module" - depends on ARM || ARM64 || COMPILE_TEST + bool "Support for Dual Timer SP804 module" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK && HAVE_CLK select CLKSRC_MMIO select TIMER_OF if OF
