Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commits:
f639eeb4a60c ("h8300: enable CLKSRC_OF")
a801eb26d124 ("h8300: Add LZO compression")
from the h8300 tree and commit:
6a5c601bf048 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/h8300/Kconfig
index 4e48d1224456,7a17112930a9..000000000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -16,9 -16,7 +16,10 @@@ config H830
select OF_EARLY_FLATTREE
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
+ select CLKSRC_OF
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_LZO
+ select H8300_TMR8
config RWSEM_GENERIC_SPINLOCK
def_bool y
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
