* linux-next: manual merge of the clk tree with the fsl tree
@ 2015-11-01 14:35 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-11-01 14:35 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Scott Wood
Cc: linux-next, linux-kernel, Javier Martinez Canillas
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/Kconfig
between commit:
9e19ca2f627e ("clk: qoriq: Add ls2080a support.")
from the fsl tree and commit:
4a7748c3d641 ("clk: Allow drivers to build if COMPILE_TEST is enabled")
from the clk tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/clk/Kconfig
index 67826167a0e0,57316528e924..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -131,7 -132,7 +142,7 @@@ config COMMON_CLK_AXI_CLKGE
config CLK_QORIQ
bool "Clock driver for Freescale QorIQ platforms"
- depends on (PPC_E500MC || ARM || ARM64) && OF
- depends on (PPC_E500MC || ARM || COMPILE_TEST) && OF
++ depends on (PPC_E500MC || ARM || ARM64 || COMPILE_TEST) && OF
---help---
This adds the clock driver support for Freescale QorIQ platforms
using common clock framework.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-11-01 14:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-01 14:35 linux-next: manual merge of the clk tree with the fsl tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).