Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/Kconfig
between commit:
863ee050726b ("clocksource/drivers: Fix dependencies for !HAS_IOMEM archs")
from Linus' tree and commit:
0219c41c9e0a ("clocksource/drivers/lpc32xx: Support timer-based ARM delay")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/clocksource/Kconfig
index 33db7406c0e2,04954877d227..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -159,7 -152,8 +159,8 @@@ config CLKSRC_EFM3
config CLKSRC_LPC32XX
bool "Clocksource for LPC32XX" if COMPILE_TEST
- depends on GENERIC_CLOCKEVENTS
+ depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
+ depends on ARM
select CLKSRC_MMIO
select CLKSRC_OF
help
