Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/Kconfig between commit e074ff86e8b4 ("ARM: 8251/1:
clocksource: enable pxa_timer for SA-1100 platform") from the arm tree
and commit e4940cd76934 ("ARM: clocksource: add asm9260_timer driver")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc drivers/clocksource/Kconfig
index 6b6f1e4950df,4f2240c9c145..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -232,11 -236,13 +239,20 @@@ config CLKSRC_MIPS_GI
depends on MIPS_GIC
select CLKSRC_OF
+config CLKSRC_PXA
+ def_bool y if ARCH_PXA || ARCH_SA1100
+ select CLKSRC_OF if USE_OF
+ help
+ This enables OST0 support available on PXA and SA-11x0
+ platforms.
+
+ config ASM9260_TIMER
+ bool "Alphascale ASM9260 timer driver"
+ select CLKSRC_MMIO
+ select CLKSRC_OF
+ default y if MACH_ASM9260
+ help
+ This enables build of a clocksource and clockevent driver for
+ the 32-bit System Timer hardware available on a Alphascale ASM9260.
+
endmenu
pgpVhqZWx20jK.pgp
Description: OpenPGP digital signature
