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 Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-5.10/revert-clocksource-drivers-sp804-make-user-selectable.patch queue-5.10/revert-clkdev-remove-config_clkdev_lookup.patch queue-5.10/usb-host-max3421-hcd-correctly-abort-a-usb-request.patch queue-5.10/ata-sata_highbank-fix-of-node-reference-leak-in-highbank_initialize_phys.patch queue-5.10/bpf-sockmap-fix-update-element-with-same.patch queue-5.10/usb-gadget-u_serial-fix-the-issue-that-gs_start_io-crashed-due-to-accessing-null-pointer.patch queue-5.10/xfs-don-t-drop-errno-values-when-we-fail-to-ficlone-the-entire-range.patch queue-5.10/xfs-fix-scrub-tracepoints-when-inode-rooted-btrees-are-involved.patch queue-5.10/drm-i915-fix-memory-leak-by-correcting-cache-object-name-in-error-handler.patch queue-5.10/bpf-sync_linked_regs-must-preserve-subreg_def.patch queue-5.10/usb-dwc2-hcd-fix-getportstatus-setportfeature.patch queue-5.10/exfat-fix-potential-deadlock-on-__exfat_get_dentry_set.patch queue-5.10/tcp-check-space-before-adding-mptcp-syn-options.patch queue-5.10/tracing-kprobes-skip-symbol-counting-logic-for-module-symbols-in-create_local_trace_kprobe.patch queue-5.10/usb-ehci-hcd-fix-call-balance-of-clocks-handling-routines.patch queue-5.10/virtio-vsock-fix-accept_queue-memory-leak.patch
